Typedef bt_intern_str

[babeltrace.git] / lib / callbacks.c

diff --git a/lib/callbacks.c b/lib/callbacks.c
index fc2c4b3d38e675e8d539e5854eed91ffd40d13f8..591f5109f15de2af16b9aff5cfc2c5ef2f8afcbe 100644 (file)
--- a/lib/callbacks.c
+++ b/lib/callbacks.c
@@ -22,6 +22,7 @@
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/callbacks-internal.h>
 #include <babeltrace/context.h>
+#include <babeltrace/context-internal.h>
 #include <babeltrace/ctf-ir/metadata.h>
 #include <babeltrace/iterator-internal.h>
 #include <inttypes.h>
@@ -57,10 +58,10 @@ struct bt_dependencies *babeltrace_dependencies_create(const char *first, ...)
 }
 
 /*
- * babeltrace_iter_add_callback: Add a callback to iterator.
+ * bt_iter_add_callback: Add a callback to iterator.
  */
-int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
-               bt_event_name event, void *private_data, int flags,
+int bt_iter_add_callback(struct bt_iter *iter,
+               bt_intern_str event, void *private_data, int flags,
                enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
                                           void *private_data),
                struct bt_dependencies *depends,
@@ -103,7 +104,7 @@ int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
                                                (gconstpointer) (unsigned long) event);
                                /* event not found in this stream class */
                                if (!event_id_ptr) {
-                                       printf("event not found\n");
+                                       fprintf(stderr, "event not found\n");
                                        continue;
                                }
                                event_id = (uint64_t)(unsigned long) *event_id_ptr;
@@ -151,24 +152,24 @@ struct ctf_stream_event *extract_ctf_stream_event(struct ctf_stream *stream)
        uint64_t id = stream->event_id;
 
        if (id >= stream_class->events_by_id->len) {
-               fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+               fprintf(stderr, "[error] Event id %" PRIu64 " is outside range.\n", id);
                return NULL;
        }
        event = g_ptr_array_index(stream->events_by_id, id);
        if (!event) {
-               fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+               fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
                return NULL;
        }
        event_class = g_ptr_array_index(stream_class->events_by_id, id);
        if (!event_class) {
-               fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+               fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
                return NULL;
        }
 
        return event;
 }
 
-void process_callbacks(struct babeltrace_iter *iter,
+void process_callbacks(struct bt_iter *iter,
                       struct ctf_stream *stream)
 {
        struct bt_stream_callbacks *bt_stream_cb;