Fix verbose and debug mode options

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 3de2dbc19f148b044fbef36da41838a8c51bf67b..38cf8392d47802224f63990d7a80d7055798fff8 100644 (file)
--- 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 fed201e7d5fbe4cd228a598f8cc39f541d141320..1c696545e92c35f176d5251e89797643b2a6692a 100644 (file)
--- 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 d53e0cfef19f1949ae7291a74cff1d0bbfa37cfd..fed85f11466933e5eb592d30842ea98e943345e6 100644 (file)
--- 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 9a91ba46736128bae32bb13daa62963198a52147..c3ed6f97246d514f2d919fbf4b4a8beff2384ba2 100644 (file)
--- 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 0bcfd1d231aed9f4b3ce9dfaab5dac0c71cd87ed..b564e79d20151685bcf7d31a73839b08160f7b50 100644 (file)
--- 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)