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

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

diff --git a/src/lib/graph/component-class-sink-simple.c b/src/lib/graph/component-class-sink-simple.c
index 6a9d2e5395464610027b78f54a0050f2b972e6e0..8a4aba536d9d97aa787cae2d5da6404244859548 100644 (file)
--- a/src/lib/graph/component-class-sink-simple.c
+++ b/src/lib/graph/component-class-sink-simple.c
@@ -51,7 +51,7 @@ struct simple_sink_data {
 };
 
 static
-enum bt_component_class_init_method_status simple_sink_init(
+enum bt_component_class_initialize_method_status simple_sink_init(
                bt_self_component_sink *self_comp,
                bt_self_component_sink_configuration *config,
                const struct bt_value *params, void *init_method_data)
@@ -141,12 +141,12 @@ simple_sink_graph_is_configured(
        }
 
        if (data->init_method_data.init_func) {
-               bt_graph_simple_sink_component_init_func_status init_status;
+               bt_graph_simple_sink_component_initialize_func_status init_status;
 
                /* Call user's initialization function */
                init_status = data->init_method_data.init_func(data->msg_iter,
                        data->init_method_data.user_data);
-               if (init_status != BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK) {
+               if (init_status != BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK) {
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Simple sink component's user's initialization function failed: "
                                "status=%s, %![comp-]+c, %![port-]+p",
@@ -171,9 +171,9 @@ enum bt_component_class_sink_consume_method_status simple_sink_consume(
        struct simple_sink_data *data = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(self_comp));
 
-       BT_ASSERT(data);
-       BT_ASSERT(data->init_method_data.consume_func);
-       BT_ASSERT(data->msg_iter);
+       BT_ASSERT_DBG(data);
+       BT_ASSERT_DBG(data->init_method_data.consume_func);
+       BT_ASSERT_DBG(data->msg_iter);
 
        /* Call user's "consume" function */
        status = data->init_method_data.consume_func(data->msg_iter,
@@ -204,7 +204,7 @@ struct bt_component_class_sink *bt_component_class_sink_simple_borrow(void)
                goto end;
        }
 
-       set_method_status = bt_component_class_sink_set_init_method(
+       set_method_status = bt_component_class_sink_set_initialize_method(
                simple_comp_cls, simple_sink_init);
        BT_ASSERT(set_method_status == BT_FUNC_STATUS_OK);
        set_method_status = bt_component_class_sink_set_finalize_method(