Fix compiler warnings

[wget] / src / options.h

diff --git a/src/options.h b/src/options.h
index 1f429906dcdc8378653f3b6de262d6c0753484a7..9358e3023a5a9893b55a7f9a62346258bcdf383b 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -60,6 +60,7 @@ struct options
   char *lfilename;             /* Log filename */
   char *input_filename;                /* Input filename */
   char *choose_config;         /* Specified config file */
+  bool noconfig;
   bool force_html;             /* Is the input file an HTML file? */
 
   char *default_page;           /* Alternative default page (index file) */
@@ -68,12 +69,25 @@ struct options
 
   char **accepts;              /* List of patterns to accept. */
   char **rejects;              /* List of patterns to reject. */
-  char **excludes;             /* List of excluded FTP directories. */
-  char **includes;             /* List of FTP directories to
+  const char **excludes;       /* List of excluded FTP directories. */
+  const char **includes;       /* List of FTP directories to
                                   follow. */
   bool ignore_case;            /* Whether to ignore case when
                                   matching dirs and files */
 
+  char *acceptregex_s;         /* Patterns to accept (a regex string). */
+  char *rejectregex_s;         /* Patterns to reject (a regex string). */
+  void *acceptregex;           /* Patterns to accept (a regex struct). */
+  void *rejectregex;           /* Patterns to reject (a regex struct). */
+  enum {
+#ifdef HAVE_LIBPCRE
+    regex_type_pcre,
+#endif
+    regex_type_posix
+  } regex_type;   /* The regex library. */
+  void *(*regex_compile_fun)(const char *);  /* Function to compile a regex. */
+  bool (*regex_match_fun)(const void *, const char *);  /* Function to match a string to a regex. */
+
   char **domains;              /* See host.c */
   char **exclude_domains;
   bool dns_cache;              /* whether we cache DNS lookups. */
@@ -102,6 +116,7 @@ struct options
   bool ask_passwd;              /* Ask for password? */
 
   bool always_rest;            /* Always use REST. */
+  wgint start_pos;             /* Start position of a download. */
   char *ftp_user;              /* FTP username */
   char *ftp_passwd;            /* FTP password */
   bool netrc;                  /* Whether to read .netrc. */
@@ -119,6 +134,7 @@ struct options
   char **no_proxy;
   char *base_href;
   char *progress_type;         /* progress indicator type. */
+  bool show_progress;        /* Show only the progress bar */
   char *proxy_user; /*oli*/
   char *proxy_passwd;
 
@@ -142,9 +158,7 @@ struct options
   bool content_on_error;       /* Do we output the content when the HTTP
                                   status code indicates a server error */
 
-#ifdef ENABLE_DEBUG
   bool debug;                  /* Debugging on/off */
-#endif
 
 #ifdef USE_WATT32
   bool wdebug;                  /* Watt-32 tcp/ip debugging on/off */
@@ -153,7 +167,7 @@ struct options
   bool timestamping;           /* Whether to use time-stamping. */
 
   bool backup_converted;       /* Do we save pre-converted files as *.orig? */
-  bool backups;                        /* Are numeric backups made? */
+  int backups;                 /* Are numeric backups made? */
 
   char *useragent;             /* User-Agent string, which can be set
                                   to something other than Wget. */
@@ -187,7 +201,8 @@ struct options
     secure_protocol_auto,
     secure_protocol_sslv2,
     secure_protocol_sslv3,
-    secure_protocol_tlsv1
+    secure_protocol_tlsv1,
+    secure_protocol_pfs
   } secure_protocol;           /* type of secure protocol to use. */
   bool check_cert;             /* whether to validate the server's cert */
   char *cert_file;             /* external client certificate to use. */
@@ -202,9 +217,9 @@ struct options
   char *ca_directory;          /* CA directory (hash files) */
   char *ca_cert;               /* CA certificate file to use */
 
-
   char *random_file;           /* file with random data to seed the PRNG */
   char *egd_file;              /* file name of the egd daemon socket */
+  bool https_only;             /* whether to follow HTTPS only */
 #endif /* HAVE_SSL */
 
   bool cookies;                        /* whether cookies are used. */
@@ -215,6 +230,9 @@ struct options
 
   char *post_data;             /* POST query string */
   char *post_file_name;                /* File to post */
+  char *method;                 /* HTTP Method to use in Header */
+  char *body_data;              /* HTTP Method Data String */
+  char *body_file;              /* HTTP Method File */
 
   enum {
     restrict_unix,
@@ -266,7 +284,7 @@ struct options
 
   bool show_all_dns_entries; /* Show all the DNS entries when resolving a
                                 name. */
-  bool bits_fmt;              /*Output bandwidth in bits format*/
+  bool report_bps;              /*Output bandwidth in bits format*/
 };
 
 extern struct options opt;