Rename `init` methods to `initialize`

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

diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 49fba13f80221c9522aa033024017df7932beb93..bafe5d032c20ed68ff7673f33869e3a527147698 100644 (file)
--- a/src/plugins/text/dmesg/dmesg.c
+++ b/src/plugins/text/dmesg/dmesg.c
@@ -24,7 +24,7 @@
 #define BT_COMP_LOG_SELF_COMP (dmesg_comp->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (dmesg_comp->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.TEXT.DMESG"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdbool.h>
 #include <string.h>
@@ -355,23 +355,23 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp)
 }
 
 static
-bt_component_class_init_method_status create_port(
+bt_component_class_initialize_method_status create_port(
                bt_self_component_source *self_comp)
 {
-       bt_component_class_init_method_status status;
+       bt_component_class_initialize_method_status status;
        bt_self_component_add_port_status add_port_status;
 
        add_port_status = bt_self_component_source_add_output_port(self_comp,
                "out", NULL, NULL);
        switch (add_port_status) {
        case BT_SELF_COMPONENT_ADD_PORT_STATUS_OK:
-               status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+               status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
                break;
        case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR:
-               status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+               status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
                break;
        case BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR:
-               status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+               status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
                break;
        default:
                abort();
@@ -381,14 +381,15 @@ bt_component_class_init_method_status create_port(
 }
 
 BT_HIDDEN
-bt_component_class_init_method_status dmesg_init(
+bt_component_class_initialize_method_status dmesg_init(
                bt_self_component_source *self_comp_src,
+               bt_self_component_source_configuration *config,
                bt_value *params, void *init_method_data)
 {
        int ret = 0;
        struct dmesg_component *dmesg_comp = g_new0(struct dmesg_component, 1);
-       bt_component_class_init_method_status status =
-               BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+       bt_component_class_initialize_method_status status =
+               BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
        bt_self_component *self_comp =
                bt_self_component_source_as_self_component(self_comp_src);
        const bt_component *comp = bt_self_component_as_component(self_comp);
@@ -426,7 +427,7 @@ bt_component_class_init_method_status dmesg_init(
        }
 
        status = create_port(self_comp_src);
-       if (status != BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) {
+       if (status != BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK) {
                goto error;
        }
 
@@ -439,7 +440,7 @@ error:
        bt_self_component_set_data(self_comp, NULL);
 
        if (status >= 0) {
-               status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+               status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
        }
 
 end:
@@ -634,12 +635,14 @@ end:
 static
 void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter)
 {
-       struct dmesg_component *dmesg_comp = dmesg_msg_iter->dmesg_comp;
+       struct dmesg_component *dmesg_comp;
 
        if (!dmesg_msg_iter) {
                return;
        }
 
+       dmesg_comp = dmesg_msg_iter->dmesg_comp;
+
        if (dmesg_msg_iter->fp && dmesg_msg_iter->fp != stdin) {
                if (fclose(dmesg_msg_iter->fp)) {
                        BT_COMP_LOGE_ERRNO("Cannot close input file", ".");
@@ -654,8 +657,9 @@ void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter)
 
 
 BT_HIDDEN
-bt_component_class_message_iterator_init_method_status dmesg_msg_iter_init(
+bt_component_class_message_iterator_initialize_method_status dmesg_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
+               bt_self_message_iterator_configuration *config,
                bt_self_component_source *self_comp,
                bt_self_component_port_output *self_port)
 {
@@ -663,8 +667,8 @@ bt_component_class_message_iterator_init_method_status dmesg_msg_iter_init(
                bt_self_component_source_as_self_component(self_comp));
        struct dmesg_msg_iter *dmesg_msg_iter =
                g_new0(struct dmesg_msg_iter, 1);
-       bt_component_class_message_iterator_init_method_status status =
-               BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
+       bt_component_class_message_iterator_initialize_method_status status =
+               BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_OK;
 
        if (!dmesg_msg_iter) {
                BT_COMP_LOGE_STR("Failed to allocate on dmesg message iterator structure.");
@@ -694,7 +698,7 @@ error:
        destroy_dmesg_msg_iter(dmesg_msg_iter);
        bt_self_message_iterator_set_data(self_msg_iter, NULL);
        if (status >= 0) {
-               status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
+               status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_ERROR;
        }
 
 end:
@@ -864,14 +868,17 @@ bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next(
 }
 
 BT_HIDDEN
-bt_bool dmesg_msg_iter_can_seek_beginning(
-               bt_self_message_iterator *self_msg_iter)
+bt_component_class_message_iterator_can_seek_beginning_method_status
+dmesg_msg_iter_can_seek_beginning(
+               bt_self_message_iterator *self_msg_iter, bt_bool *can_seek)
 {
        struct dmesg_msg_iter *dmesg_msg_iter =
                bt_self_message_iterator_get_data(self_msg_iter);
 
        /* Can't seek the beginning of the standard input stream */
-       return !dmesg_msg_iter->dmesg_comp->params.read_from_stdin;
+       *can_seek = !dmesg_msg_iter->dmesg_comp->params.read_from_stdin;
+
+       return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK;
 }
 
 BT_HIDDEN