ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist

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

diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c
index 8a8b3eed5f0d0f15a994cf4c84efcb1b172da70a..a8c376f5d98b79945ebc358d05eb01ace83f3007 100644 (file)
--- a/formats/ctf/callbacks.c
+++ b/formats/ctf/callbacks.c
@@ -115,13 +115,13 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
                        if (event) {
                                /* find the event id */
                                event_id_ptr = g_hash_table_lookup(stream->event_quark_to_id,
-                                               (gconstpointer) (unsigned long) event);
+                                               (gconstpointer) GUINT_TO_POINTER(event));
                                /* event not found in this stream class */
                                if (!event_id_ptr) {
                                        fprintf(stderr, "[error] Event ID not found in stream class\n");
                                        continue;
                                }
-                               event_id = (uint64_t)(unsigned long) *event_id_ptr;
+                               event_id = GPOINTER_TO_UINT(*event_id_ptr);
 
                                /* find or create the bt_callback_chain for this event */
                                if (event_id >= bt_stream_cb->per_id_callbacks->len) {
@@ -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: