X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcallbacks.c;h=591f5109f15de2af16b9aff5cfc2c5ef2f8afcbe;hp=b3856cebc7b2449068293639715acc1b473d0bc9;hb=34861b9ddd0eb8040ac54e51f9352c4d7ff6fead;hpb=3394d22e104e2f6511b656773ef4e74506842f3e

diff --git a/lib/callbacks.c b/lib/callbacks.c
index b3856ceb..591f5109 100644
--- 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,
@@ -168,7 +169,7 @@ struct ctf_stream_event *extract_ctf_stream_event(struct ctf_stream *stream)
 	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;