From b734a468c166aa728b8df7b03391d69d5ba4fe43 Mon Sep 17 00:00:00 2001
From: Alex Young <alex@bytemark.co.uk>
Date: Sat, 14 Jul 2012 12:27:16 +0100
Subject: [PATCH] Make the --verbose flag universal

Previously, the --verbose flag was only present in debug builds. Now
it's present whether you define DEBUG or not.  What changes is the
amount of information printed to stderr: DEBUG sets the --verbose log
level to 0 (debug), while DEBUG unset sets it to 1 (info).  This makes
driving the binary slightly simpler as you don't have to detect whether
it's a debug build by scanning for "--verbose" in the help output.
---
 src/mode.c | 10 +++++-----
 src/mode.h | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/mode.c b/src/mode.c
index 41d1edf..efca788 100644
--- a/src/mode.c
+++ b/src/mode.c
@@ -207,7 +207,7 @@ void read_serve_param( int c, char **ip_addr, char **ip_port, char **file, char
 			log_level = 4;
 			break;
 		case 'v':
-			log_level = 0;
+			log_level = VERBOSE_LOG_LEVEL;
 			break;
 		default:
 			exit_err( serve_help_text );
@@ -255,7 +255,7 @@ void read_listen_param( int c,
 			log_level = 4;
 			break;
 		case 'v':
-			log_level = 0;
+			log_level = VERBOSE_LOG_LEVEL;
 			break;
 		default:
 			exit_err( listen_help_text );
@@ -289,7 +289,7 @@ void read_readwrite_param( int c, char **ip_addr, char **ip_port, char **bind_ad
 			log_level = 4;
 			break;
 		case 'v':
-			log_level = 0;
+			log_level = VERBOSE_LOG_LEVEL;
 			break;
 		default:
 			exit_err( read_help_text );
@@ -311,7 +311,7 @@ void read_sock_param( int c, char **sock, char *help_text )
 			log_level = 4;
 			break;
 		case 'v':
-			log_level = 0;
+			log_level = VERBOSE_LOG_LEVEL;
 			break;
 		default:
 			exit_err( help_text );
@@ -347,7 +347,7 @@ void read_mirror_param( int c, char **sock, char **ip_addr, char **ip_port, char
 			log_level = 4;
 			break;
 		case 'v':
-			log_level = 0;
+			log_level = VERBOSE_LOG_LEVEL;
 			break;
 		default:
 			exit_err( mirror_help_text );
diff --git a/src/mode.h b/src/mode.h
index fc53f83..e8bc5c8 100644
--- a/src/mode.h
+++ b/src/mode.h
@@ -51,23 +51,23 @@ void mode(char* mode, int argc, char **argv);
 #define GETOPT_SIZE GETOPT_ARG( OPT_SIZE, 'S' )
 #define GETOPT_BIND GETOPT_ARG( OPT_BIND, 'b' )
 
-#ifdef DEBUG
-#  define OPT_VERBOSE "verbose"
-#  define SOPT_VERBOSE "v"
-#  define GETOPT_VERBOSE GETOPT_FLAG( OPT_VERBOSE, 'v' )
-#  define VERBOSE_LINE \
+#define OPT_VERBOSE "verbose"
+#define SOPT_VERBOSE "v"
+#define GETOPT_VERBOSE GETOPT_FLAG( OPT_VERBOSE, 'v' )
+#define VERBOSE_LINE \
   "\t--" OPT_VERBOSE ",-" SOPT_VERBOSE "\t\tOutput debug information.\n"
+
+#ifdef DEBUG
+# define VERBOSE_LOG_LEVEL 0
 #else
-#  define GETOPT_VERBOSE {0}
-#  define VERBOSE_LINE ""
-#  define SOPT_VERBOSE ""
+# define VERBOSE_LOG_LEVEL 1
 #endif
 
 #define OPT_QUIET "quiet"
 #define SOPT_QUIET "q"
 #define GETOPT_QUIET GETOPT_FLAG( OPT_QUIET, 'q' )
 #define QUIET_LINE \
-	"\t--" OPT_QUIET ",-" SOPT_QUIET "\t\tOutput only fatal informatio.\n"
+	"\t--" OPT_QUIET ",-" SOPT_QUIET "\t\tOutput only fatal information.\n"
 
 
 #define HELP_LINE \