Fix: lib: add NULL check for destroy_listeners in destroy_component_class

[babeltrace.git] / src / lib / graph / port.c

diff --git a/src/lib/graph/port.c b/src/lib/graph/port.c
index 65e57196a17548651db771a73a38cb46ca18780b..291615a81955e98a15a0e9c5a08f5df1880332b4 100644 (file)
--- a/src/lib/graph/port.c
+++ b/src/lib/graph/port.c
@@ -9,7 +9,7 @@
 #include "lib/logging.h"
 
 #include "common/assert.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include <babeltrace2/graph/port.h>
 #include <babeltrace2/graph/self-component-port.h>
 #include "lib/object.h"
@@ -73,34 +73,34 @@ end:
 
 const char *bt_port_get_name(const struct bt_port *port)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
+       BT_ASSERT_PRE_DEV_PORT_NON_NULL(port);
        return port->name->str;
 }
 
 enum bt_port_type bt_port_get_type(const struct bt_port *port)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
+       BT_ASSERT_PRE_DEV_PORT_NON_NULL(port);
        return port->type;
 }
 
 const struct bt_connection *bt_port_borrow_connection_const(
                const struct bt_port *port)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
+       BT_ASSERT_PRE_DEV_PORT_NON_NULL(port);
        return port->connection;
 }
 
 const struct bt_component *bt_port_borrow_component_const(
                const struct bt_port *port)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
+       BT_ASSERT_PRE_DEV_PORT_NON_NULL(port);
        return bt_port_borrow_component_inline(port);
 }
 
 struct bt_self_component *bt_self_component_port_borrow_component(
                struct bt_self_component_port *port)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
+       BT_ASSERT_PRE_DEV_PORT_NON_NULL(port);
        return (void *) bt_object_borrow_parent((void *) port);
 }
 
@@ -120,13 +120,13 @@ void bt_port_set_connection(struct bt_port *port,
 
 bt_bool bt_port_is_connected(const struct bt_port *port)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
+       BT_ASSERT_PRE_DEV_PORT_NON_NULL(port);
        return port->connection ? BT_TRUE : BT_FALSE;
 }
 
 void *bt_self_component_port_get_data(const struct bt_self_component_port *port)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
+       BT_ASSERT_PRE_DEV_PORT_NON_NULL(port);
        return ((struct bt_port *) port)->user_data;
 }