X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fcallbacks.c;h=9242a2b98ea57ee123e1cef876054b51c43b4d96;hb=118f5776fcc9e4dc1e79d96d697825bc95174fcb;hp=793f3d3874e039b30afbe16684a0e27968540450;hpb=9426d563f74aed0b0f32818d4ef535cdfacdb167;p=babeltrace.git

diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c
index 793f3d38..9242a2b9 100644
--- 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);
@@ -203,8 +203,6 @@ void process_callbacks(struct bt_ctf_iter *iter,
 	if (iter->main_callbacks.callback) {
 		for (i = 0; i < iter->main_callbacks.callback->len; i++) {
 			cb = &g_array_index(iter->main_callbacks.callback, struct bt_callback, i);
-			if (!cb)
-				goto end;
 			ret = cb->callback(&ctf_data, cb->private_data);
 			switch (ret) {
 			case BT_CB_OK_STOP:
@@ -231,8 +229,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: