Replace assert() -> BT_ASSERT() and some preconditions with BT_ASSERT_PRE()

[babeltrace.git] / include / babeltrace / graph / notification-iterator-internal.h

diff --git a/include/babeltrace/graph/notification-iterator-internal.h b/include/babeltrace/graph/notification-iterator-internal.h
index fd3dd4f30ec0134f140ca1491e8967d6ca288947..e0d841fcd0c6c201bb45bda6ae520cd7bf66be97 100644 (file)
--- a/include/babeltrace/graph/notification-iterator-internal.h
+++ b/include/babeltrace/graph/notification-iterator-internal.h
@@ -34,8 +34,8 @@
 #include <babeltrace/graph/notification-iterator.h>
 #include <babeltrace/graph/private-connection-private-notification-iterator.h>
 #include <babeltrace/types.h>
+#include <babeltrace/assert-internal.h>
 #include <stdbool.h>
-#include <assert.h>
 
 struct bt_port;
 struct bt_graph;
@@ -111,7 +111,7 @@ struct bt_notification_iterator_private_connection {
         *   other notifications which refer to this stream can be
         *   delivered by this iterator.
         *
-        * The key (struct bt_ctf_stream *) is not owned by this. The
+        * The key (struct bt_stream *) is not owned by this. The
         * value is an allocated state structure.
         */
        GHashTable *stream_states;
@@ -147,7 +147,7 @@ static inline
 struct bt_notification *bt_notification_iterator_borrow_current_notification(
                struct bt_notification_iterator *iterator)
 {
-       assert(iterator);
+       BT_ASSERT(iterator);
        return iterator->current_notification;
 }
 
@@ -156,14 +156,14 @@ void bt_notification_iterator_replace_current_notification(
                struct bt_notification_iterator *iterator,
                struct bt_notification *notification)
 {
-       assert(iterator);
+       BT_ASSERT(iterator);
        bt_put(iterator->current_notification);
        iterator->current_notification = bt_get(notification);
 }
 
 static inline
 struct bt_notification_iterator_private_connection *
-bt_private_connection_notification_iterator_from_private(
+bt_private_connection_notification_iterator_borrow_from_private(
                struct bt_private_connection_private_notification_iterator *private_notification_iterator)
 {
        return (void *) private_notification_iterator;