[svn] Move extern declarations to .h files.

[wget] / src / retr.h

diff --git a/src/retr.h b/src/retr.h
index 6f896d97c8f720905c2099193433f39a2748879b..305ced4f94bee212d871a750144e2eb26dae48e0 100644 (file)
--- a/src/retr.h
+++ b/src/retr.h
@@ -30,38 +30,35 @@ so, delete this exception statement from your version.  */
 #ifndef RETR_H
 #define RETR_H
 
+/* These global vars should be made static to retr.c and exported via
+   functions! */
+extern SUM_SIZE_INT total_downloaded_bytes;
+extern double total_download_time;
+extern FILE *output_stream;
+extern bool output_stream_regular;
+
 /* Flags for fd_read_body. */
 enum {
   rb_read_exactly  = 1,
   rb_skip_startpos = 2
 };
 
-int fd_read_body PARAMS ((int, FILE *, wgint, wgint, wgint *, wgint *, double *,
-                          int));
-
-typedef const char *(*hunk_terminator_t) PARAMS ((const char *, int, int));
-
-char *fd_read_hunk PARAMS ((int, hunk_terminator_t, long, long));
-char *fd_read_line PARAMS ((int));
-
-uerr_t retrieve_url PARAMS ((const char *, char **, char **,
-                            const char *, int *));
-uerr_t retrieve_from_file PARAMS ((const char *, int, int *));
-
-char *retr_rate PARAMS ((wgint, double, int));
-double calc_rate PARAMS ((wgint, double, int *));
-void printwhat PARAMS ((int, int));
+int fd_read_body (int, FILE *, wgint, wgint, wgint *, wgint *, double *, int);
 
-void sleep_between_retrievals PARAMS ((int));
+typedef const char *(*hunk_terminator_t) (const char *, int, int);
 
-void rotate_backups PARAMS ((const char *));
+char *fd_read_hunk (int, hunk_terminator_t, long, long);
+char *fd_read_line (int);
 
-/* Because there's no http.h. */
+uerr_t retrieve_url (const char *, char **, char **, const char *, int *);
+uerr_t retrieve_from_file (const char *, bool, int *);
 
-struct url;
+const char *retr_rate (wgint, double);
+double calc_rate (wgint, double, int *);
+void printwhat (int, int);
 
-uerr_t http_loop PARAMS ((struct url *, char **, char **, const char *,
-                         int *, struct url *));
+void sleep_between_retrievals (int);
 
+void rotate_backups (const char *);
 
 #endif /* RETR_H */