Add CTF Writer implementation

[babeltrace.git] / formats / ctf / callbacks.c

diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c
index 793f3d3874e039b30afbe16684a0e27968540450..8a8b3eed5f0d0f15a994cf4c84efcb1b172da70a 100644 (file)
--- a/formats/ctf/callbacks.c
+++ b/formats/ctf/callbacks.c
@@ -89,7 +89,7 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
        tc = iter->parent.ctx->tc;
        for (i = 0; i < tc->array->len; i++) {
                struct ctf_trace *tin;
-               struct trace_descriptor *td_read;
+               struct bt_trace_descriptor *td_read;
 
                td_read = g_ptr_array_index(tc->array, i);
                tin = container_of(td_read, struct ctf_trace, parent);
@@ -231,8 +231,6 @@ void process_callbacks(struct bt_ctf_iter *iter,
 
        for (i = 0; i < bt_chain->callback->len; i++) {
                cb = &g_array_index(bt_chain->callback, struct bt_callback, i);
-               if (!cb)
-                       goto end;
                ret = cb->callback(&ctf_data, cb->private_data);
                switch (ret) {
                case BT_CB_OK_STOP: