Always evaluate BT_ASSERT(); add BT_ASSERT_DBG() for debug mode only

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

diff --git a/src/lib/graph/component-filter.c b/src/lib/graph/component-filter.c
index 259ba6268bcc9573e635a21b802bdded45fcb037..010e8fe85f5b2007ada57d7a57ee1d646ec1b39a 100644 (file)
--- a/src/lib/graph/component-filter.c
+++ b/src/lib/graph/component-filter.c
@@ -22,7 +22,7 @@
  */
 
 #define BT_LOG_TAG "LIB/COMPONENT-FILTER"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
@@ -35,6 +35,7 @@
 #include "component-filter.h"
 #include "component.h"
 #include "component-class.h"
+#include "lib/func-status.h"
 
 BT_HIDDEN
 void bt_component_filter_destroy(struct bt_component *component)
@@ -49,7 +50,8 @@ struct bt_component *bt_component_filter_create(
 
        filter = g_new0(struct bt_component_filter, 1);
        if (!filter) {
-               BT_LOGE_STR("Failed to allocate one filter component.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to allocate one filter component.");
                goto end;
        }
 
@@ -63,12 +65,12 @@ bt_component_filter_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;
 
-       BT_ASSERT(cls);
-       BT_ASSERT(cls->type == BT_COMPONENT_CLASS_TYPE_FILTER);
+       BT_ASSERT_DBG(cls);
+       BT_ASSERT_DBG(cls->type == BT_COMPONENT_CLASS_TYPE_FILTER);
 
        return (bt_component_class_filter *) cls;
 }
@@ -111,18 +113,18 @@ bt_self_component_filter_borrow_output_port_by_index(
                (void *) comp, index);
 }
 
-enum bt_self_component_status bt_self_component_filter_add_output_port(
+enum bt_self_component_add_port_status bt_self_component_filter_add_output_port(
                struct bt_self_component_filter *self_comp,
                const char *name, void *user_data,
                struct bt_self_component_port_output **self_port)
 {
        struct bt_component *comp = (void *) self_comp;
-       enum bt_self_component_status status;
+       enum bt_self_component_add_port_status status;
        struct bt_port *port = NULL;
 
        /* bt_component_add_output_port() logs details and errors */
        status = bt_component_add_output_port(comp, name, user_data, &port);
-       if (status != BT_SELF_COMPONENT_STATUS_OK) {
+       if (status != BT_FUNC_STATUS_OK) {
                goto end;
        }
 
@@ -179,18 +181,18 @@ bt_self_component_filter_borrow_input_port_by_index(
                (void *) component, index);
 }
 
-enum bt_self_component_status bt_self_component_filter_add_input_port(
+enum bt_self_component_add_port_status bt_self_component_filter_add_input_port(
                struct bt_self_component_filter *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;
        }