[svn] Remove K&R support.

[wget] / src / main.c

diff --git a/src/main.c b/src/main.c
index 43c00b0d7cfd55774f533ebc2dc257755c0e5650..f9eabaf8bfc31e7aba6872147a93a5497199c17c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -34,12 +34,7 @@ so, delete this exception statement from your version.  */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
-#include <sys/types.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif /* HAVE_STRING_H */
+#include <string.h>
 #ifdef HAVE_SIGNAL_H
 # include <signal.h>
 #endif
@@ -49,11 +44,7 @@ so, delete this exception statement from your version.  */
 #endif /* HAVE_LOCALE_H */
 #endif /* HAVE_NLS */
 #include <assert.h>
-
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
 #include "wget.h"
 #include "utils.h"
@@ -79,7 +70,7 @@ extern char *version_string;
 
 extern struct cookie_jar *wget_cookie_jar;
 
-static RETSIGTYPE redirect_output_signal PARAMS ((int));
+static RETSIGTYPE redirect_output_signal (int);
 
 const char *exec_name;
 \f
@@ -115,8 +106,8 @@ i18n_initialize (void)
 \f
 /* Definition of command-line options. */
 
-static void print_help PARAMS ((void));
-static void print_version PARAMS ((void));
+static void print_help (void);
+static void print_version (void);
 
 #ifdef HAVE_SSL
 # define IF_SSL(x) x
@@ -144,7 +135,7 @@ struct cmdline_option {
     OPT__DONT_REMOVE_LISTING,
     OPT__EXECUTE,
     OPT__NO,
-    OPT__PARENT,
+    OPT__PARENT
   } type;
   const void *data;            /* for standard options */
   int argtype;                 /* for non-standard options */
@@ -547,8 +538,8 @@ HTTP options:\n"),
     N_("\
 HTTPS (SSL/TLS) options:\n"),
     N_("\
-       --secure-protocol=PR     choose SSL protocol, one of auto, SSLv2, SSLv3,\n\
-                                and TLSv1.\n"),
+       --secure-protocol=PR     choose secure protocol, one of auto, SSLv2,\n\
+                                SSLv3, and TLSv1.\n"),
     N_("\
        --no-check-certificate   don't validate the server's certificate.\n"),
     N_("\
@@ -738,7 +729,7 @@ main (int argc, char *const *argv)
          break;
        case OPT_FUNCALL:
          {
-           void (*func) PARAMS ((void)) = (void (*) PARAMS ((void))) opt->data;
+           void (*func) (void) = (void (*) (void)) opt->data;
            func ();
          }
          break;