diff lib/protocols.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/protocols.c	Fri Mar 16 02:33:05 2007 +0000
+++ b/lib/protocols.c	Fri Mar 16 02:44:07 2007 +0000
@@ -174,7 +174,7 @@
 
 
 off_t
-gftp_get_file (gftp_request * request, const char *filename, int fd,
+gftp_get_file (gftp_request * request, const char *filename,
                off_t startsize)
 {
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
@@ -183,12 +183,12 @@
   if (request->get_file == NULL)
     return (GFTP_EFATAL);
 
-  return (request->get_file (request, filename, fd, startsize));
+  return (request->get_file (request, filename, startsize));
 }
 
 
 int
-gftp_put_file (gftp_request * request, const char *filename, int fd,
+gftp_put_file (gftp_request * request, const char *filename,
                off_t startsize, off_t totalsize)
 {
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
@@ -197,15 +197,14 @@
   if (request->put_file == NULL)
     return (GFTP_EFATAL);
 
-  return (request->put_file (request, filename, fd, startsize, totalsize));
+  return (request->put_file (request, filename, startsize, totalsize));
 }
 
 
 off_t
 gftp_transfer_file (gftp_request * fromreq, const char *fromfile, 
-                    int fromfd, off_t fromsize, 
-                    gftp_request * toreq, const char *tofile,
-                    int tofd, off_t tosize)
+                    off_t fromsize, gftp_request * toreq, const char *tofile,
+                    off_t tosize)
 {
   /* Needed for systems that size(float) < size(void *) */
   union { intptr_t i; float f; } maxkbs;
@@ -235,7 +234,7 @@
   toreq->cached = 0;
 
 get_file:
-  size = gftp_get_file (fromreq, fromfile, fromfd, tosize);
+  size = gftp_get_file (fromreq, fromfile, tosize);
   if (size < 0)
     {
       if (size == GFTP_ETIMEDOUT)
@@ -251,7 +250,7 @@
     }
 
 put_file:
-  ret = gftp_put_file (toreq, tofile, tofd, tosize, size);
+  ret = gftp_put_file (toreq, tofile, tosize, size);
   if (ret != 0)
     {
       if (size == GFTP_ETIMEDOUT)