X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Fdebug-info.c;h=af6795965018e43351f331a1a9dbf107c150463b;hp=fa2a492e9a8884d435a838112a300fb275cb61f7;hb=21a9f056fd7d86d18aa7a1700c7f47d93eb1adeb;hpb=fe4df857056b4a03898f1031f136359ce733b0f5

diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c
index fa2a492e..af679596 100644
--- a/src/plugins/lttng-utils/debug-info/debug-info.c
+++ b/src/plugins/lttng-utils/debug-info/debug-info.c
@@ -1746,15 +1746,15 @@ int init_from_params(struct debug_info_component *debug_info_component,
 }
 
 BT_HIDDEN
-bt_component_class_init_method_status debug_info_comp_init(
+bt_component_class_initialize_method_status debug_info_comp_init(
 		bt_self_component_filter *self_comp_flt,
 		bt_self_component_filter_configuration *config,
 		const bt_value *params, __attribute__((unused)) void *init_method_data)
 {
 	int ret;
 	struct debug_info_component *debug_info_comp;
-	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_add_port_status add_port_status;
 	bt_self_component *self_comp =
 		bt_self_component_filter_as_self_component(self_comp_flt);
@@ -1779,10 +1779,10 @@ bt_component_class_init_method_status debug_info_comp_init(
 		self_comp_flt, "in", NULL, NULL);
 	switch (add_port_status) {
 	case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR:
-		status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+		status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
 		goto error;
 	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;
 		goto error;
 	default:
 		break;
@@ -1792,10 +1792,10 @@ bt_component_class_init_method_status debug_info_comp_init(
 			self_comp_flt, "out", NULL, NULL);
 	switch (add_port_status) {
 	case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR:
-		status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+		status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
 		goto error;
 	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;
 		goto error;
 	default:
 		break;
@@ -1815,8 +1815,8 @@ error:
 	destroy_debug_info_comp(debug_info_comp);
 	bt_self_component_set_data(self_comp, NULL);
 
-	if (status == BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) {
-		status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+	if (status == BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK) {
+		status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
 	}
 end:
 	return status;
@@ -1956,13 +1956,13 @@ end:
 }
 
 BT_HIDDEN
-bt_component_class_message_iterator_init_method_status debug_info_msg_iter_init(
+bt_component_class_message_iterator_initialize_method_status debug_info_msg_iter_init(
 		bt_self_message_iterator *self_msg_iter,
 		bt_self_message_iterator_configuration *config,
 		bt_self_component_filter *self_comp_flt,
 		bt_self_component_port_output *self_port)
 {
-	bt_component_class_message_iterator_init_method_status status;
+	bt_component_class_message_iterator_initialize_method_status status;
 	bt_self_component_port_input_message_iterator_create_from_message_iterator_status
 		msg_iter_status;
 	struct bt_self_component_port_input *input_port = NULL;
@@ -1979,13 +1979,13 @@ bt_component_class_message_iterator_init_method_status debug_info_msg_iter_init(
 	input_port = bt_self_component_filter_borrow_input_port_by_name(
 		self_comp_flt, "in");
 	if (!input_port) {
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_ERROR;
 		goto error;
 	}
 
 	debug_info_msg_iter = g_new0(struct debug_info_msg_iter, 1);
 	if (!debug_info_msg_iter) {
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
@@ -2008,7 +2008,7 @@ bt_component_class_message_iterator_init_method_status debug_info_msg_iter_init(
 		g_direct_hash, g_direct_equal, (GDestroyNotify) NULL,
 		(GDestroyNotify) debug_info_destroy);
 	if (!debug_info_msg_iter->debug_info_map) {
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
@@ -2021,20 +2021,20 @@ bt_component_class_message_iterator_init_method_status debug_info_msg_iter_init(
 	debug_info_msg_iter->ir_maps = trace_ir_maps_create(self_comp,
 		debug_info_field_name, log_level);
 	if (!debug_info_msg_iter->ir_maps) {
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
 	ret = bt_fd_cache_init(&debug_info_msg_iter->fd_cache, log_level);
 	if (ret) {
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
 	bt_self_message_iterator_set_data(self_msg_iter, debug_info_msg_iter);
 	debug_info_msg_iter->input_iterator = self_msg_iter;
 
-	status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
+	status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_OK;
 	goto end;
 
 error: