X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.c;h=c3b8a2ed9a0f6ee6acbc95e5cda19078d05771c2;hb=4175c1d52f91f7e5d66a12135ad8ec6ec736a539;hp=2149b89c6f0d7d3c9bf6652cb0091004f7e07878;hpb=76276a81e72d967979674fdc0a646b42d8d6033e;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index 2149b89c..c3b8a2ed 100644
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -248,7 +248,7 @@ void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
 }
 
 BT_HIDDEN
-bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init(
+bt_component_class_message_iterator_initialize_method_status ctf_fs_iterator_init(
 		bt_self_message_iterator *self_msg_iter,
 		bt_self_message_iterator_configuration *config,
 		bt_self_component_source *self_comp_src,
@@ -256,8 +256,8 @@ bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init(
 {
 	struct ctf_fs_port_data *port_data;
 	struct ctf_fs_msg_iter_data *msg_iter_data = NULL;
-	bt_component_class_message_iterator_init_method_status ret =
-		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
+	bt_component_class_message_iterator_initialize_method_status ret =
+		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_OK;
 	bt_logging_level log_level;
 	bt_self_component *self_comp =
 		bt_self_component_source_as_self_component(self_comp_src);
@@ -269,7 +269,7 @@ bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init(
 	log_level = port_data->ctf_fs->log_level;
 	msg_iter_data = g_new0(struct ctf_fs_msg_iter_data, 1);
 	if (!msg_iter_data) {
-		ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
@@ -283,19 +283,19 @@ bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init(
 		self_comp);
 	if (!msg_iter_data->msg_iter) {
 		BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot create a CTF message iterator.");
-		ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
 	msg_iter_data->ds_file_group = port_data->ds_file_group;
 	if (ctf_fs_iterator_reset(msg_iter_data)) {
-		ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
+		ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_ERROR;
 		goto error;
 	}
 
 	bt_self_message_iterator_set_data(self_msg_iter,
 		msg_iter_data);
-	if (ret != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK) {
+	if (ret != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_OK) {
 		goto error;
 	}
 
@@ -2390,18 +2390,18 @@ end:
 }
 
 BT_HIDDEN
-bt_component_class_init_method_status ctf_fs_init(
+bt_component_class_initialize_method_status ctf_fs_init(
 		bt_self_component_source *self_comp_src,
 		bt_self_component_source_configuration *config,
 		const bt_value *params, __attribute__((unused)) void *init_method_data)
 {
 	struct ctf_fs_component *ctf_fs;
-	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;
 
 	ctf_fs = ctf_fs_create(params, self_comp_src, NULL);
 	if (!ctf_fs) {
-		ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+		ret = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
 	}
 
 	return ret;