fix/breakage API : replace bt_ctf_event

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index de9b49600fc5e0543690bc2104bfc6f194195e82..fc590ecc50134b10a30ccde0d36c008d1b6aa2b3 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -327,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.
@@ -393,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;
@@ -407,7 +407,7 @@ int convert_trace(struct trace_descriptor *td_write,
        struct bt_ctf_iter *iter;
        struct ctf_text_stream_pos *sout;
        struct bt_iter_pos begin_pos;
-       struct bt_ctf_event *ctf_event;
+       struct ctf_event_definition *ctf_event;
        int ret;
 
        sout = container_of(td_write, struct ctf_text_stream_pos,