From 8b596b57e1ff348a11b596b85278c17445e06afb Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Tue, 25 Oct 2016 11:43:21 -0400
Subject: [PATCH] Fix verbose and debug mode options
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 converter/babeltrace-log.c               | 2 +-
 converter/babeltrace.c                   | 5 +++--
 formats/ctf/metadata/ctf-parser-test.c   | 2 +-
 include/babeltrace/babeltrace-internal.h | 3 ++-
 lib/babeltrace.c                         | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 3de2dbc1..38cf8392 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -53,7 +53,7 @@
 #define NSEC_PER_SEC 1000000000ULL
 #define USEC_PER_SEC 1000000UL
 
-int babeltrace_debug, babeltrace_verbose;
+bool babeltrace_debug, babeltrace_verbose;
 
 static char *s_outputname;
 static int s_timestamp;
diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index fed201e7..1c696545 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -61,8 +61,6 @@ void print_component_classes_found(struct bt_component_factory *factory)
 {
 	int count, i;
 
-	babeltrace_verbose = 1;
-
 	if (!babeltrace_verbose) {
 		return;
 	}
@@ -263,6 +261,9 @@ int main(int argc, char **argv)
 		goto end;
 	}
 
+	babeltrace_verbose = cfg->verbose;
+	babeltrace_debug = cfg->debug;
+
 	/* TODO handle more than 1 source and 1 sink. */
 	if (cfg->sources->len != 1 || cfg->sinks->len != 1) {
 		fprintf(stderr, "Unexpected configuration, aborting.../n");
diff --git a/formats/ctf/metadata/ctf-parser-test.c b/formats/ctf/metadata/ctf-parser-test.c
index d53e0cfe..fed85f11 100644
--- a/formats/ctf/metadata/ctf-parser-test.c
+++ b/formats/ctf/metadata/ctf-parser-test.c
@@ -35,7 +35,7 @@
 #include "ctf-parser.h"
 #include "ctf-ast.h"
 
-int babeltrace_verbose, babeltrace_debug;
+bool babeltrace_verbose, babeltrace_debug;
 
 int main(int argc, char **argv)
 {
diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 9a91ba46..c3ed6f97 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -29,11 +29,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <babeltrace/compat/string.h>
 
 #define PERROR_BUFLEN	200
 
-extern int babeltrace_verbose, babeltrace_debug;
+extern bool babeltrace_verbose, babeltrace_debug;
 
 #define printf_verbose(fmt, args...)					\
 	do {								\
diff --git a/lib/babeltrace.c b/lib/babeltrace.c
index 0bcfd1d2..b564e79d 100644
--- a/lib/babeltrace.c
+++ b/lib/babeltrace.c
@@ -31,7 +31,7 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdlib.h>
 
-int babeltrace_verbose, babeltrace_debug;
+bool babeltrace_verbose, babeltrace_debug;
 
 static
 void __attribute__((constructor)) init_babeltrace_lib(void)
-- 
2.34.1