From bd552be4309ea5ed62bc9f537b8a48c888a79ebd Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Thu, 5 Nov 2020 08:49:16 +0100
Subject: [PATCH] Allow verbosity increase with -V

+ small updates
---
 src/debug.cpp | 11 ++++-------
 src/host.cpp  |  2 +-
 src/main.cpp  | 11 +++++------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/debug.cpp b/src/debug.cpp
index 5bd7e545f..50e5b7e22 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -181,16 +181,13 @@ void debug_dump(void *lp, int len)
 }
 
 bool set_log_level(const char *optarg, bool *logger_repeat_msgs) {
+        assert(optarg != nullptr);
+        assert(logger_repeat_msgs != nullptr);
+
         using namespace std::string_literals;
         using std::clog;
         using std::cout;
 
-        *logger_repeat_msgs = false;
-        if (optarg == nullptr) {
-                log_level = LOG_LEVEL_VERBOSE;
-                return true;
-        }
-
         static const struct { const char *name; int level; } mapping[] = {
                 { "quiet", LOG_LEVEL_QUIET },
                 { "fatal", LOG_LEVEL_FATAL },
@@ -204,7 +201,7 @@ bool set_log_level(const char *optarg, bool *logger_repeat_msgs) {
         };
 
         if ("help"s == optarg) {
-                cout << "log level: [0-8";
+                cout << "log level: [0-" << LOG_LEVEL_MAX;
                 for (auto m : mapping) {
                         cout << "|" << m.name;
                 }
diff --git a/src/host.cpp b/src/host.cpp
index 9c4218190..ce70b7289 100644
--- a/src/host.cpp
+++ b/src/host.cpp
@@ -189,7 +189,7 @@ struct init_data *common_preinit(int argc, char *argv[], const char *log_opt)
         uv_argc = argc;
         uv_argv = argv;
 
-        if (!set_log_level(log_opt, &logger_repeat_msgs)) {
+        if (log_opt != nullptr && !set_log_level(log_opt, &logger_repeat_msgs)) {
                 return nullptr;
         }
 
diff --git a/src/main.cpp b/src/main.cpp
index 8b92ab2f7..84bcae192 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -133,7 +133,6 @@ static constexpr const char *DEFAULT_AUDIO_CODEC = "PCM";
 #define OPT_PIX_FMTS (('P' << 8) | 'F')
 #define OPT_PROTOCOL (('P' << 8) | 'R')
 #define OPT_START_PAUSED (('S' << 8) | 'P')
-#define OPT_VERBOSE (('V' << 8) | 'E')
 #define OPT_VIDEO_CODECS (('V' << 8) | 'C')
 #define OPT_VIDEO_PROTOCOL (('V' << 8) | 'P')
 #define OPT_WINDOW_TITLE (('W' << 8) | 'T')
@@ -716,7 +715,7 @@ int main(int argc, char *argv[])
                 {"capture-filter", required_argument, 0, OPT_CAPTURE_FILTER},
                 {"control-port", required_argument, 0, OPT_CONTROL_PORT},
                 {"encryption", required_argument, 0, OPT_ENCRYPTION},
-                {"verbose", optional_argument, 0, OPT_VERBOSE},
+                {"verbose", optional_argument, nullptr, 'V'},
                 {"window-title", required_argument, 0, OPT_WINDOW_TITLE},
                 {"capabilities", no_argument, 0, OPT_CAPABILITIES},
                 {"audio-delay", required_argument, 0, OPT_AUDIO_DELAY},
@@ -731,7 +730,7 @@ int main(int argc, char *argv[])
                 {"video-codecs", no_argument, 0, OPT_VIDEO_CODECS},
                 {0, 0, 0, 0}
         };
-        const char optstring[] = "d:t:m:r:s:v46c:hM:p:f:P:l:A:";
+        const char optstring[] = "d:t:m:r:s:v46c:hM:p:f:P:l:A:V";
 
         const char *audio_protocol = "ultragrid_rtp";
         const char *audio_protocol_opts = "";
@@ -747,11 +746,11 @@ int main(int argc, char *argv[])
                 getopt_long(argc, argv, optstring, getopt_options,
                             NULL)) != -1) {
                 switch (ch) {
-                case OPT_VERBOSE:
+                case 'V':
                         if (optarg) {
                                 log_opt = optarg;
                         } else {
-                                log_opt = "verbose";
+                                log_level += 1;
                         }
                         break;
                 default:
@@ -1059,7 +1058,7 @@ int main(int argc, char *argv[])
                                 connection_type = 0;
                         }
                         break;
-                case OPT_VERBOSE:
+                case 'V':
                         break; // already handled earlier
                 case OPT_WINDOW_TITLE:
                         log_msg(LOG_LEVEL_WARNING, "Deprecated option used, please use "