Babeltrace ctf-text duplicated error message

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index baffb195242889211a4d32eb6fd55d049352c474..a6c1f548677127f44691c2dd28e68982222a74a2 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -25,6 +25,9 @@
 #include <babeltrace/context.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf/events.h>
+/* TODO: fix object model for format-agnostic callbacks */
+#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/ctf/iterator.h>
 #include <babeltrace/ctf-text/types.h>
 #include <babeltrace/iterator.h>
 #include <popt.h>
@@ -324,7 +327,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
        GArray *trace_ids;
        char lpath[PATH_MAX];
        char * const paths[2] = { lpath, NULL };
-       int ret;
+       int ret = -1;
 
        /*
         * Need to copy path, because fts_open can change it.
@@ -378,7 +381,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 
                        trace_id = bt_context_add_trace(ctx,
                                node->fts_accpath, format_str,
-                               packet_seek);
+                               packet_seek, NULL, NULL);
                        if (trace_id < 0) {
                                fprintf(stderr, "[error] [Context] opening trace \"%s\" from %s "
                                        "for reading.\n", node->fts_accpath, path);
@@ -390,7 +393,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
        }
 
        g_array_free(trace_ids, TRUE);
-       return 0;
+       return ret;
 
 error:
        return ret;
@@ -417,7 +420,7 @@ int convert_trace(struct trace_descriptor *td_write,
                goto error_iter;
        }
        while ((ctf_event = bt_ctf_iter_read_event(iter))) {
-               ret = sout->parent.event_cb(&sout->parent, ctf_event->stream);
+               ret = sout->parent.event_cb(&sout->parent, ctf_event->parent->stream);
                if (ret) {
                        fprintf(stderr, "[error] Writing event failed.\n");
                        goto end;