Rename ctf_stream_event to ctf_event_definition

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

diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c
index f4e0a1451c84974deba2b279563ba663e71aac14..6130911fec112da82f429fa60fd676e94883e96c 100644 (file)
--- a/formats/ctf/callbacks.c
+++ b/formats/ctf/callbacks.c
@@ -83,7 +83,7 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
                tin = container_of(td_read, struct ctf_trace, parent);
 
                for (stream_id = 0; stream_id < tin->streams->len; stream_id++) {
-                       struct ctf_stream_class *stream;
+                       struct ctf_stream_declaration *stream;
                        struct bt_stream_callbacks *bt_stream_cb = NULL;
                        struct bt_callback_chain *bt_chain = NULL;
                        struct bt_callback new_callback;
@@ -106,7 +106,7 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
                                                (gconstpointer) (unsigned long) event);
                                /* event not found in this stream class */
                                if (!event_id_ptr) {
-                                       fprintf(stderr, "event not found\n");
+                                       fprintf(stderr, "[error] Event ID not found in stream class\n");
                                        continue;
                                }
                                event_id = (uint64_t)(unsigned long) *event_id_ptr;
@@ -146,11 +146,11 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
 }
 
 static
-struct ctf_stream_event *extract_ctf_stream_event(struct ctf_stream *stream)
+struct ctf_event_definition *extract_ctf_stream_event(struct ctf_stream *stream)
 {
-       struct ctf_stream_class *stream_class = stream->stream_class;
+       struct ctf_stream_declaration *stream_class = stream->stream_class;
        struct ctf_event *event_class;
-       struct ctf_stream_event *event;
+       struct ctf_event_definition *event;
        uint64_t id = stream->event_id;
 
        if (id >= stream_class->events_by_id->len) {