diff lib/rfc959.c @ 895:4ab11f70a7f4

2007-3-15 Brian Masney <[e-mail]> * lib/sshv2.c lib/gftp.h lib/rfc959.c lib/protocols.c lib/fsp.c lib/local.c lib/rfc2068.c src/uicommon/gftpui.c - removed fd argument to *_get_file(), *_put_file() and gftp_transfer_file().

--- a/lib/rfc959.c	Fri Mar 16 02:33:05 2007 +0000
+++ b/lib/rfc959.c	Fri Mar 16 02:44:07 2007 +0000
@@ -1224,10 +1224,9 @@
 
 
 static off_t
-rfc959_get_file (gftp_request * request, const char *filename, int fd,
+rfc959_get_file (gftp_request * request, const char *filename,
                  off_t startsize)
 {
-  rfc959_parms * parms;
   char *tempstr;
   int ret;
 
@@ -1235,10 +1234,6 @@
   g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
-  parms = request->protocol_data;
-  if (fd > 0)
-    parms->data_connection = fd;
-
   ret = rfc959_setup_file_transfer (request, filename, startsize, "RETR");
   if (ret < 0)
     return (ret);
@@ -1257,7 +1252,7 @@
 
 
 static int
-rfc959_put_file (gftp_request * request, const char *filename, int fd,
+rfc959_put_file (gftp_request * request, const char *filename,
                  off_t startsize, off_t totalsize)
 {
   rfc959_parms * parms;
@@ -1267,13 +1262,10 @@
   g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
-  parms = request->protocol_data;
-  if (fd > 0) /* FIXME */
-    fd = parms->data_connection;
-
   if ((ret = rfc959_set_data_type (request, filename)) < 0)
     return (ret);
 
+  parms = request->protocol_data;
   if (parms->data_connection < 0 && 
       (ret = rfc959_data_connection_new (request, 0)) < 0)
     return (ret);