Babeltrace wrapper update

[babeltrace.git] / formats / ctf / metadata / ctf-parser-test.c

diff --git a/formats/ctf/metadata/ctf-parser-test.c b/formats/ctf/metadata/ctf-parser-test.c
index b99817e02d4374719e58545d9db9e0c8f16febf0..72c45885dc939f62c1622fd0aea08e6ad7895d77 100644 (file)
--- a/formats/ctf/metadata/ctf-parser-test.c
+++ b/formats/ctf/metadata/ctf-parser-test.c
@@ -20,13 +20,14 @@
 #include <stdio.h>
 #include <glib.h>
 #include <errno.h>
-#include <endian.h>
+#include <babeltrace/endian.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/metadata.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
 #include "ctf-ast.h"
 
-extern int yydebug;
+int babeltrace_verbose, babeltrace_debug;
 
 int main(int argc, char **argv)
 {
@@ -34,34 +35,36 @@ int main(int argc, char **argv)
        struct ctf_trace *trace;
        int ret = 0;
 
-       yydebug = 1;
+       babeltrace_debug = 1;
+       babeltrace_verbose = 1;
        scanner = ctf_scanner_alloc(stdin);
        if (!scanner) {
-               fprintf(stdout, "Error allocating scanner\n");
+               fprintf(stderr, "Error allocating scanner\n");
                return -ENOMEM;
        }
        ret = ctf_scanner_append_ast(scanner);
        if (ret) {
-               fprintf(stdout, "Error creating AST\n");
+               fprintf(stderr, "Error creating AST\n");
                goto end;
        }
 
-       ret = ctf_visitor_print_xml(stdout, 0, &scanner->ast->root);
+       ret = ctf_visitor_print_xml(stderr, 0, &scanner->ast->root);
        if (ret) {
-               fprintf(stdout, "Error visiting AST for XML output\n");
+               fprintf(stderr, "Error visiting AST for XML output\n");
                goto end;
        }
 
-       ret = ctf_visitor_semantic_check(stdout, 0, &scanner->ast->root);
+       ret = ctf_visitor_semantic_check(stderr, 0, &scanner->ast->root);
        if (ret) {
-               fprintf(stdout, "Error in CTF semantic validation %d\n", ret);
+               fprintf(stderr, "Error in CTF semantic validation %d\n", ret);
                goto end;
        }
        trace = malloc(sizeof(*trace));
-       ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root,
+       memset(trace, 0, sizeof(*trace));
+       ret = ctf_visitor_construct_metadata(stderr, 0, &scanner->ast->root,
                        trace, BYTE_ORDER);
        if (ret) {
-               fprintf(stdout, "Error in CTF metadata constructor %d\n", ret);
+               fprintf(stderr, "Error in CTF metadata constructor %d\n", ret);
                goto free_trace;
        }
 free_trace: