Fix error checking in bt_context_add_traces_recursive

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 54efdfe0b0aa288be3ec47ef6c85b7182f484634..aadeb441cf18ed81fa4a43b14d77e8d27389af72 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -25,6 +25,8 @@
 #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>
@@ -325,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.
@@ -391,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;