X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.h;fp=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.h;h=544e35591660c9c47ee4c78c07c1b1f39e23326f;hb=d6e69534ef08a2dd8bff9eb5af1eab63736b3d31;hp=d8e6ff99f8336c0bf3777cb15754af229d0a0201;hpb=c8db321922f3730c70628a5e452baf8a046e70fd;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/data-stream-file.h b/plugins/ctf/fs-src/data-stream-file.h
index d8e6ff99..544e3559 100644
--- a/plugins/ctf/fs-src/data-stream-file.h
+++ b/plugins/ctf/fs-src/data-stream-file.h
@@ -29,7 +29,7 @@
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/babeltrace.h>
 
-#include "../common/notif-iter/notif-iter.h"
+#include "../common/msg-iter/msg-iter.h"
 #include "lttng-index.h"
 
 struct ctf_fs_component;
@@ -91,7 +91,7 @@ struct ctf_fs_ds_file {
 	struct ctf_fs_metadata *metadata;
 
 	/* Weak */
-	bt_self_notification_iterator *pc_notif_iter;
+	bt_self_message_iterator *pc_msg_iter;
 
 	/* Owned by this */
 	struct ctf_fs_file *file;
@@ -100,7 +100,7 @@ struct ctf_fs_ds_file {
 	bt_stream *stream;
 
 	/* Weak */
-	struct bt_notif_iter *notif_iter;
+	struct bt_msg_iter *msg_iter;
 
 	void *mmap_addr;
 
@@ -128,8 +128,8 @@ struct ctf_fs_ds_file {
 BT_HIDDEN
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 		struct ctf_fs_trace *ctf_fs_trace,
-		bt_self_notification_iterator *pc_notif_iter,
-		struct bt_notif_iter *notif_iter,
+		bt_self_message_iterator *pc_msg_iter,
+		struct bt_msg_iter *msg_iter,
 		bt_stream *stream, const char *path);
 
 BT_HIDDEN
@@ -142,9 +142,9 @@ BT_HIDDEN
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
 
 BT_HIDDEN
-enum bt_notification_iterator_status ctf_fs_ds_file_next(
+enum bt_message_iterator_status ctf_fs_ds_file_next(
 		struct ctf_fs_ds_file *ds_file,
-		bt_notification **notif);
+		bt_message **msg);
 
 BT_HIDDEN
 struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
@@ -153,6 +153,6 @@ struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
 BT_HIDDEN
 void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
 
-extern struct bt_notif_iter_medium_ops ctf_fs_ds_file_medops;
+extern struct bt_msg_iter_medium_ops ctf_fs_ds_file_medops;
 
 #endif /* CTF_FS_DS_FILE_H */