Fix: lib: add NULL check for destroy_listeners in destroy_component_class

[babeltrace.git] / src / lib / graph / component-sink.c

diff --git a/src/lib/graph/component-sink.c b/src/lib/graph/component-sink.c
index 1f4a5a66589533e65d83c10d5849788f31058f37..d45532b455c8e89c1740d0b1711e5ab8cd8bb43a 100644 (file)
--- a/src/lib/graph/component-sink.c
+++ b/src/lib/graph/component-sink.c
@@ -9,8 +9,7 @@
 #include "lib/logging.h"
 
 #include "common/assert.h"
-#include "lib/assert-pre.h"
-#include "lib/assert-post.h"
+#include "lib/assert-cond.h"
 #include "compat/compiler.h"
 #include <babeltrace2/value.h>
 #include <babeltrace2/graph/self-component.h>
@@ -33,8 +32,6 @@ struct bt_component *bt_component_sink_create(
 {
        struct bt_component_sink *sink = NULL;
 
-       BT_ASSERT_PRE_NO_ERROR();
-
        sink = g_new0(struct bt_component_sink, 1);
        if (!sink) {
                BT_LIB_LOGE_APPEND_CAUSE(
@@ -52,7 +49,7 @@ bt_component_sink_borrow_class_const(
 {
        struct bt_component_class *cls;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_COMP_NON_NULL(component);
 
        cls = component->parent.class;
 
@@ -65,42 +62,55 @@ bt_component_sink_borrow_class_const(
 uint64_t bt_component_sink_get_input_port_count(
                const struct bt_component_sink *component)
 {
-       /* bt_component_get_input_port_count() logs details/errors */
-       return bt_component_get_input_port_count((void *) component);
+       /* bt_component_get_input_port_count() checks preconditions */
+       return bt_component_get_input_port_count((void *) component, __func__);
 }
 
 const struct bt_port_input *
 bt_component_sink_borrow_input_port_by_name_const(
                const struct bt_component_sink *component, const char *name)
 {
-       /* bt_component_borrow_input_port_by_name() logs details/errors */
-       return bt_component_borrow_input_port_by_name((void *) component, name);
+       /*
+        * bt_component_borrow_input_port_by_name() logs details/errors
+        * and checks preconditions.
+        */
+       return bt_component_borrow_input_port_by_name((void *) component, name,
+               __func__);
 }
 
 struct bt_self_component_port_input *
 bt_self_component_sink_borrow_input_port_by_name(
                struct bt_self_component_sink *component, const char *name)
 {
-       /* bt_component_borrow_input_port_by_name() logs details/errors */
+       /*
+        * bt_component_borrow_input_port_by_name() logs details/errors
+        * and checks preconditions.
+        */
        return (void *) bt_component_borrow_input_port_by_name(
-               (void *) component, name);
+               (void *) component, name, __func__);
 }
 
 const struct bt_port_input *bt_component_sink_borrow_input_port_by_index_const(
                const struct bt_component_sink *component, uint64_t index)
 {
-       /* bt_component_borrow_input_port_by_index() logs details/errors */
+       /*
+        * bt_component_borrow_input_port_by_index() logs details/errors
+        * and checks preconditions.
+        */
        return bt_component_borrow_input_port_by_index(
-               (void *) component, index);
+               (void *) component, index, __func__);
 }
 
 struct bt_self_component_port_input *
 bt_self_component_sink_borrow_input_port_by_index(
                struct bt_self_component_sink *component, uint64_t index)
 {
-       /* bt_component_borrow_input_port_by_index() logs details/errors */
+       /*
+        * bt_component_borrow_input_port_by_index() logs details/errors
+        * and checks preconditions.
+        */
        return (void *) bt_component_borrow_input_port_by_index(
-               (void *) component, index);
+               (void *) component, index, __func__);
 }
 
 enum bt_self_component_add_port_status bt_self_component_sink_add_input_port(
@@ -113,10 +123,13 @@ enum bt_self_component_add_port_status bt_self_component_sink_add_input_port(
        struct bt_component *comp = (void *) self_comp;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_INPUT_PORT_NAME_UNIQUE(comp, name);
 
-       /* bt_component_add_input_port() logs details/errors */
-       status = bt_component_add_input_port(comp, name, user_data, &port);
+       /*
+        * bt_component_add_input_port() logs details/errors and checks
+        * preconditions.
+        */
+       status = bt_component_add_input_port(comp, name, user_data, &port,
+               __func__);
        if (status != BT_FUNC_STATUS_OK) {
                goto end;
        }
@@ -136,7 +149,7 @@ bt_bool bt_self_component_sink_is_interrupted(
 {
        struct bt_component *comp = (void *) self_comp;
 
-       BT_ASSERT_PRE_NON_NULL(comp, "Component");
+       BT_ASSERT_PRE_COMP_NON_NULL(comp);
        return (bt_bool) bt_graph_is_interrupted(
                bt_component_borrow_graph(comp));
 }