Rename `init` methods to `initialize`

[babeltrace.git] / src / plugins / text / pretty / pretty.c

diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c
index 5c0aae8209ab8ab487dba183ccc217f515c94663..973e45fe000b9a180203ae6b574735467423941c 100644 (file)
--- a/src/plugins/text/pretty/pretty.c
+++ b/src/plugins/text/pretty/pretty.c
@@ -154,21 +154,26 @@ BT_HIDDEN
 bt_component_class_sink_graph_is_configured_method_status
 pretty_graph_is_configured(bt_self_component_sink *comp)
 {
-       bt_component_class_sink_graph_is_configured_method_status status =
-               BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+       bt_component_class_sink_graph_is_configured_method_status status;
+       bt_self_component_port_input_message_iterator_create_from_sink_component_status
+               msg_iter_status;
        struct pretty_component *pretty;
 
        pretty = bt_self_component_get_data(
                        bt_self_component_sink_as_self_component(comp));
        BT_ASSERT(pretty);
        BT_ASSERT(!pretty->iterator);
-       pretty->iterator = bt_self_component_port_input_message_iterator_create(
-               bt_self_component_sink_borrow_input_port_by_name(comp,
-                       in_port_name));
-       if (!pretty->iterator) {
-               status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_ERROR;
+       msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+               comp, bt_self_component_sink_borrow_input_port_by_name(comp,
+                       in_port_name), &pretty->iterator);
+       if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+               status = (int) msg_iter_status;
+               goto end;
        }
 
+       status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+
+end:
        return status;
 }
 
@@ -608,22 +613,24 @@ void set_use_colors(struct pretty_component *pretty)
 }
 
 BT_HIDDEN
-bt_component_class_init_method_status pretty_init(
-               bt_self_component_sink *comp, const bt_value *params,
+bt_component_class_initialize_method_status pretty_init(
+               bt_self_component_sink *comp,
+               bt_self_component_sink_configuration *config,
+               const bt_value *params,
                __attribute__((unused)) void *init_method_data)
 {
-       bt_component_class_init_method_status ret =
-               BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+       bt_component_class_initialize_method_status ret =
+               BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
        struct pretty_component *pretty = create_pretty();
 
        if (!pretty) {
-               ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+               ret = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
                goto end;
        }
 
        if (bt_self_component_sink_add_input_port(comp,
                        in_port_name, NULL, NULL) < 0) {
-               ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+               ret = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
                goto error;
        }
 
@@ -637,7 +644,7 @@ bt_component_class_init_method_status pretty_init(
        pretty->last_real_timestamp = -1ULL;
 
        if (apply_params(pretty, params)) {
-               ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+               ret = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
                goto error;
        }