Notification iterator: transform precondition checks to BT_ASSERT_PRE()

[babeltrace.git] / plugins / utils / dummy / dummy.c

diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c
index 5e6987934c614cc0f600ef3a43fd747d39206aba..0535b95806cf4762b6159f00deaaeb76631c08a9 100644 (file)
--- a/plugins/utils/dummy/dummy.c
+++ b/plugins/utils/dummy/dummy.c
@@ -20,20 +20,10 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <plugins-common.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 #include "dummy.h"
 
 void destroy_private_dummy_data(struct dummy *dummy)
@@ -46,9 +36,9 @@ void dummy_finalize(struct bt_private_component *component)
 {
        struct dummy *dummy;
 
-       assert(component);
+       BT_ASSERT(component);
        dummy = bt_private_component_get_user_data(component);
-       assert(dummy);
+       BT_ASSERT(dummy);
        destroy_private_dummy_data(dummy);
 }
 
@@ -94,11 +84,11 @@ void dummy_port_connected(
        enum bt_connection_status conn_status;
 
        dummy = bt_private_component_get_user_data(component);
-       assert(dummy);
+       BT_ASSERT(dummy);
        connection = bt_private_port_get_private_connection(self_port);
-       assert(connection);
+       BT_ASSERT(connection);
        conn_status = bt_private_connection_create_notification_iterator(
-               connection, NULL, &iterator);
+               connection, &iterator);
        if (conn_status != BT_CONNECTION_STATUS_OK) {
                dummy->error = true;
                goto end;
@@ -118,7 +108,7 @@ enum bt_component_status dummy_consume(struct bt_private_component *component)
        enum bt_notification_iterator_status it_ret;
 
        dummy = bt_private_component_get_user_data(component);
-       assert(dummy);
+       BT_ASSERT(dummy);
 
        if (unlikely(dummy->error)) {
                ret = BT_COMPONENT_STATUS_ERROR;