From 0a41b946d40e5504d0185c57a35596a50a83575e Mon Sep 17 00:00:00 2001 From: hniksic Date: Fri, 24 Jun 2005 04:44:38 -0700 Subject: [PATCH] [svn] Declare opt.verbose as int, not bool. --- src/ChangeLog | 4 ++++ src/init.c | 19 ++++++++++++++++++- src/options.h | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 511a0f70..47264cfb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-24 Hrvoje Niksic + + * init.c: opt.verbose must be declared as int. + 2005-06-23 Hrvoje Niksic * cmpt.c (strpbrk): Removed. diff --git a/src/init.c b/src/init.c index c81a67bc..686cac96 100644 --- a/src/init.c +++ b/src/init.c @@ -89,6 +89,7 @@ CMD_DECLARE (cmd_spec_secure_protocol); #endif CMD_DECLARE (cmd_spec_timeout); CMD_DECLARE (cmd_spec_useragent); +CMD_DECLARE (cmd_spec_verbose); /* List of recognized commands, each consisting of name, place and function. When adding a new command, simply add it to the list, @@ -230,7 +231,7 @@ static struct { { "useproxy", &opt.use_proxy, cmd_boolean }, { "user", &opt.user, cmd_string }, { "useragent", NULL, cmd_spec_useragent }, - { "verbose", &opt.verbose, cmd_boolean }, + { "verbose", NULL, cmd_spec_verbose }, { "wait", &opt.wait, cmd_time }, { "waitretry", &opt.waitretry, cmd_time } }; @@ -1254,6 +1255,22 @@ cmd_spec_useragent (const char *com, const char *val, void *place_ignored) opt.useragent = xstrdup (val); return true; } + +/* The "verbose" option cannot be cmd_boolean because the variable is + not bool -- it's of type int (-1 means uninitialized because of + some random hackery for disallowing -q -v). */ + +static bool +cmd_spec_verbose (const char *com, const char *val, void *place_ignored) +{ + bool flag; + if (cmd_boolean (com, val, &flag)) + { + opt.verbose = flag; + return true; + } + return false; +} /* Miscellaneous useful routines. */ diff --git a/src/options.h b/src/options.h index 94f7baec..097a0ffb 100644 --- a/src/options.h +++ b/src/options.h @@ -29,7 +29,8 @@ so, delete this exception statement from your version. */ struct options { - bool verbose; /* Are we verbose? */ + int verbose; /* Are we verbose? (First set to -1, + hence not boolean.) */ bool quiet; /* Are we quiet? */ int ntry; /* Number of tries per URL */ bool retry_connrefused; /* Treat CONNREFUSED as non-fatal. */ -- 2.39.2