[svn] Move extern declarations to .h files.

[wget] / src / ftp.h

diff --git a/src/ftp.h b/src/ftp.h
index a5e73927f1aac2f19f5af86770389e3732d0d33a..0d4aec52cbd8b94fbc60f0d453dcf4a1c17c79d6 100644 (file)
--- a/src/ftp.h
+++ b/src/ftp.h
@@ -30,9 +30,6 @@ so, delete this exception statement from your version.  */
 #ifndef FTP_H
 #define FTP_H
 
-/* Need it for struct rbuf.  */
-#include "rbuf.h"
-
 #include "host.h"
 
 /* System types. */
@@ -45,23 +42,31 @@ enum stype
   ST_OS400,
   ST_OTHER
 };
-  
-uerr_t ftp_response PARAMS ((struct rbuf *, char **));
-uerr_t ftp_login PARAMS ((struct rbuf *, const char *, const char *));
-uerr_t ftp_port PARAMS ((struct rbuf *));
-uerr_t ftp_pasv PARAMS ((struct rbuf *, ip_address *, unsigned short *));
+
+extern char ftp_last_respline[];
+
+uerr_t ftp_response (int, char **);
+uerr_t ftp_login (int, const char *, const char *);
+uerr_t ftp_port (int, int *);
+uerr_t ftp_pasv (int, ip_address *, int *);
 #ifdef ENABLE_IPV6
-uerr_t ftp_epsv PARAMS ((struct rbuf *, ip_address *, unsigned short *,
-                        char *));
+uerr_t ftp_lprt (int, int *);
+uerr_t ftp_lpsv (int, ip_address *, int *);
+uerr_t ftp_eprt (int, int *);
+uerr_t ftp_epsv (int, ip_address *, int *);
+#endif
+uerr_t ftp_type (int, int);
+uerr_t ftp_cwd (int, const char *);
+uerr_t ftp_retr (int, const char *);
+uerr_t ftp_rest (int, wgint);
+uerr_t ftp_list (int, const char *);
+uerr_t ftp_syst (int, enum stype *);
+uerr_t ftp_pwd (int, char **);
+uerr_t ftp_size (int, const char *, wgint *);
+
+#ifdef ENABLE_OPIE
+const char *skey_response (int, const char *, const char *);
 #endif
-uerr_t ftp_type PARAMS ((struct rbuf *, int));
-uerr_t ftp_cwd PARAMS ((struct rbuf *, const char *));
-uerr_t ftp_retr PARAMS ((struct rbuf *, const char *));
-uerr_t ftp_rest PARAMS ((struct rbuf *, long));
-uerr_t ftp_list PARAMS ((struct rbuf *, const char *));
-uerr_t ftp_syst PARAMS ((struct rbuf *, enum stype *));
-uerr_t ftp_pwd PARAMS ((struct rbuf *, char **));
-uerr_t ftp_size PARAMS ((struct rbuf *, const char *, long int *));
 
 struct url;
 
@@ -78,7 +83,7 @@ enum ftype
 /* Globbing (used by ftp_retrieve_glob).  */
 enum
 {
-  GLOBALL, GETALL, GETONE
+  GLOB_GLOBALL, GLOB_GETALL, GLOB_GETONE
 };
 
 /* Information about one filename in a linked list.  */
@@ -86,7 +91,7 @@ struct fileinfo
 {
   enum ftype type;             /* file type */
   char *name;                  /* file name */
-  long size;                   /* file size */
+  wgint size;                  /* file size */
   long tstamp;                 /* time-stamp */
   int perms;                   /* file permissions */
   char *linkto;                        /* link to which file points */
@@ -101,9 +106,7 @@ enum wget_ftp_command
   DO_CWD        = 0x0002,      /* Change current directory.  */
   DO_RETR       = 0x0004,      /* Retrieve the file.  */
   DO_LIST       = 0x0008,      /* Retrieve the directory list.  */
-  LEAVE_PENDING = 0x0010,      /* Do not close the socket.  */
-  NO_TRUNCATE  = 0x0020        /* Don't truncate the file if REST
-                                  malfunctions. */
+  LEAVE_PENDING = 0x0010       /* Do not close the socket.  */
 };
 
 enum wget_ftp_fstatus
@@ -115,12 +118,12 @@ enum wget_ftp_fstatus
                                   correct.  */
 };
 
-struct fileinfo *ftp_parse_ls PARAMS ((const char *, const enum stype));
-uerr_t ftp_loop PARAMS ((struct url *, int *, struct url *));
+struct fileinfo *ftp_parse_ls (const char *, const enum stype);
+uerr_t ftp_loop (struct url *, int *, struct url *);
 
-uerr_t ftp_index PARAMS ((const char *, struct url *, struct fileinfo *));
+uerr_t ftp_index (const char *, struct url *, struct fileinfo *);
 
-char ftp_process_type PARAMS ((const char *));
+char ftp_process_type (const char *);
 
 
 #endif /* FTP_H */