[Spice-devel] [PATCH spice-streaming-agent v3] log_binary is really a boolean

[Frediano Ziglio]

From: Christophe de Dinechin <dinechin at redhat.com>

Signed-off-by: Christophe de Dinechin <dinechin at redhat.com>
---
Change since v3:
- change enum syntax.

Change since v2:
- rebased.

Change since v1:
- do not clash with possible short 'b' option.
---
 src/spice-streaming-agent.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/spice-streaming-agent.cpp b/src/spice-streaming-agent.cpp
index 4b14b6f..494cf8e 100644
--- a/src/spice-streaming-agent.cpp
+++ b/src/spice-streaming-agent.cpp
@@ -58,9 +58,9 @@ struct SpiceStreamDataMessage
 
 static bool streaming_requested = false;
 static bool quit_requested = false;
+static bool log_binary = false;
 static std::set<SpiceVideoCodecType> client_codecs;
 static int streamfd = -1;
-static int log_binary = 0;
 static std::mutex stream_mtx;
 
 static int have_something_to_read(int timeout)
@@ -451,11 +451,13 @@ int main(int argc, char* argv[])
     int logmask = LOG_UPTO(LOG_WARNING);
     const char *pluginsdir = PLUGINSDIR;
     enum {
-        OPT_PLUGINS_DIR = UCHAR_MAX+1
+        OPT_first = UCHAR_MAX,
+        OPT_PLUGINS_DIR,
+        OPT_LOG_BINARY,
     };
-    struct option long_options[] = {
+    static const struct option long_options[] = {
         { "plugins-dir", required_argument, NULL, OPT_PLUGINS_DIR},
-        { "log-binary", no_argument, &log_binary, 1},
+        { "log-binary", no_argument, NULL, OPT_LOG_BINARY},
         { "help", no_argument, NULL, 'h'},
         { 0, 0, 0, 0}
     };
@@ -486,6 +488,9 @@ int main(int argc, char* argv[])
             agent.AddOption(optarg, p);
             break;
         }
+        case OPT_LOG_BINARY:
+            log_binary = true;
+            break;
         case 'l':
             log_filename = optarg;
             break;
-- 
2.14.3