X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=aadeb441cf18ed81fa4a43b14d77e8d27389af72;hp=6905070a25a062ed50aff09fc54537fb302b64dd;hb=ec4c2b5ccbda1625a9011c27994186bf78cc9d72;hpb=0d4c669fab9287d78d5d34e3de9e1e701da431cb

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 6905070a..aadeb441 100644
--- 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.
@@ -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;