lib: make BT_ASSERT_{PRE,POST}() always on; add BT_ASSERT_{PRE,POST}_DEV()

[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 fe25db6e5001a3eeca5142e64abdce94f342eaeb..b218144d145d863f3630843c21880a3b6d2e6d87 100644 (file)
--- a/src/lib/graph/component-sink.c
+++ b/src/lib/graph/component-sink.c
@@ -34,6 +34,7 @@
 
 #include "component-sink.h"
 #include "component.h"
+#include "lib/func-status.h"
 
 BT_HIDDEN
 void bt_component_sink_destroy(struct bt_component *component)
@@ -48,7 +49,8 @@ struct bt_component *bt_component_sink_create(
 
        sink = g_new0(struct bt_component_sink, 1);
        if (!sink) {
-               BT_LOGE_STR("Failed to allocate one sink component.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to allocate one sink component.");
                goto end;
        }
 
@@ -62,7 +64,7 @@ bt_component_sink_borrow_class_const(
 {
        struct bt_component_class *cls;
 
-       BT_ASSERT_PRE_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
 
        cls = component->parent.class;
 
@@ -113,18 +115,18 @@ bt_self_component_sink_borrow_input_port_by_index(
                (void *) component, index);
 }
 
-enum bt_self_component_status bt_self_component_sink_add_input_port(
+enum bt_self_component_add_port_status bt_self_component_sink_add_input_port(
                struct bt_self_component_sink *self_comp,
                const char *name, void *user_data,
                struct bt_self_component_port_input **self_port)
 {
-       enum bt_self_component_status status;
+       enum bt_self_component_add_port_status status;
        struct bt_port *port = NULL;
        struct bt_component *comp = (void *) self_comp;
 
        /* bt_component_add_input_port() logs details/errors */
        status = bt_component_add_input_port(comp, name, user_data, &port);
-       if (status != BT_SELF_COMPONENT_STATUS_OK) {
+       if (status != BT_FUNC_STATUS_OK) {
                goto end;
        }