X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_bt_notification_iterator.c;h=d4bb01da49973e7eb292b002f159313bfc744a68;hb=fe7265b50927fe05576f8c5cedaea1d8433d8a02;hp=d6ca1973d58c4960539f3068a6f3d5fc891dd9d2;hpb=a19804e742baa94691303e48e4e41bc0a4a8d917;p=babeltrace.git

diff --git a/tests/lib/test_bt_notification_iterator.c b/tests/lib/test_bt_notification_iterator.c
index d6ca1973..d4bb01da 100644
--- a/tests/lib/test_bt_notification_iterator.c
+++ b/tests/lib/test_bt_notification_iterator.c
@@ -50,7 +50,7 @@
 #include <babeltrace/graph/private-component-sink.h>
 #include <babeltrace/graph/private-component.h>
 #include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-notification-iterator.h>
+#include <babeltrace/graph/private-connection-private-notification-iterator.h>
 #include <babeltrace/graph/private-port.h>
 #include <babeltrace/plugin/plugin.h>
 #include <babeltrace/ref.h>
@@ -483,10 +483,10 @@ void fini_static_data(void)
 
 static
 void src_iter_finalize(
-		struct bt_private_notification_iterator *private_notification_iterator)
+		struct bt_private_connection_private_notification_iterator *private_notification_iterator)
 {
 	struct src_iter_user_data *user_data =
-		bt_private_notification_iterator_get_user_data(
+		bt_private_connection_private_notification_iterator_get_user_data(
 			private_notification_iterator);
 
 	if (user_data) {
@@ -496,7 +496,7 @@ void src_iter_finalize(
 
 static
 enum bt_notification_iterator_status src_iter_init(
-		struct bt_private_notification_iterator *priv_notif_iter,
+		struct bt_private_connection_private_notification_iterator *priv_notif_iter,
 		struct bt_private_port *private_port)
 {
 	struct src_iter_user_data *user_data =
@@ -504,7 +504,7 @@ enum bt_notification_iterator_status src_iter_init(
 	int ret;
 
 	assert(user_data);
-	ret = bt_private_notification_iterator_set_user_data(priv_notif_iter,
+	ret = bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter,
 		user_data);
 	assert(ret == 0);
 
@@ -565,10 +565,10 @@ struct bt_ctf_event *src_create_event(struct bt_ctf_packet *packet)
 }
 
 static
-struct bt_notification_iterator_next_return src_iter_next_seq(
+struct bt_notification_iterator_next_method_return src_iter_next_seq(
 		struct src_iter_user_data *user_data)
 {
-	struct bt_notification_iterator_next_return next_return = {
+	struct bt_notification_iterator_next_method_return next_return = {
 		.status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
 	};
 	int64_t cur_ts_ns;
@@ -681,15 +681,15 @@ struct bt_notification_iterator_next_return src_iter_next_seq(
 }
 
 static
-struct bt_notification_iterator_next_return src_iter_next(
-		struct bt_private_notification_iterator *priv_iterator)
+struct bt_notification_iterator_next_method_return src_iter_next(
+		struct bt_private_connection_private_notification_iterator *priv_iterator)
 {
-	struct bt_notification_iterator_next_return next_return = {
+	struct bt_notification_iterator_next_method_return next_return = {
 		.status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
 		.notification = NULL,
 	};
 	struct src_iter_user_data *user_data =
-		bt_private_notification_iterator_get_user_data(priv_iterator);
+		bt_private_connection_private_notification_iterator_get_user_data(priv_iterator);
 
 	assert(user_data);
 	next_return = src_iter_next_seq(user_data);