X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;fp=converter%2Fbabeltrace.c;h=928f623b478d9d07806dfb295a2bb42c08407812;hp=af7a5ba6157eabb53f4f300d79cff983ab8bba6e;hb=90de159b47c08681635528a6fee20ef336f431f1;hpb=869da1d97d6179aba49b6785b6651e9ab20217cb

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index af7a5ba6..928f623b 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -644,12 +644,12 @@ static int cmd_help(struct bt_config *cfg)
 		goto end;
 	}
 
-	plugin = find_plugin(cfg->cmd_data.help.plugin_name->str);
+	plugin = find_plugin(cfg->cmd_data.help.cfg_component->plugin_name->str);
 	if (!plugin) {
 		fprintf(stderr, "%s%sCannot find plugin %s%s%s\n",
 			bt_common_color_bold(), bt_common_color_fg_red(),
 			bt_common_color_fg_blue(),
-			cfg->cmd_data.help.plugin_name->str,
+			cfg->cmd_data.help.cfg_component->plugin_name->str,
 			bt_common_color_reset());
 		ret = -1;
 		goto end;
@@ -662,13 +662,13 @@ static int cmd_help(struct bt_config *cfg)
 			bt_plugin_get_component_class_count(plugin));
 
 
-	if (cfg->cmd_data.help.comp_cls_type !=
+	if (cfg->cmd_data.help.cfg_component->type !=
 			BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
 		struct bt_component_class *needed_comp_cls =
 			find_component_class(
-				cfg->cmd_data.help.plugin_name->str,
-				cfg->cmd_data.help.component_name->str,
-				cfg->cmd_data.help.comp_cls_type);
+				cfg->cmd_data.help.cfg_component->plugin_name->str,
+				cfg->cmd_data.help.cfg_component->component_name->str,
+				cfg->cmd_data.help.cfg_component->type);
 
 		if (!needed_comp_cls) {
 			fprintf(stderr, "\n%s%sCannot find component class %s",
@@ -676,9 +676,9 @@ static int cmd_help(struct bt_config *cfg)
 				bt_common_color_fg_red(),
 				bt_common_color_reset());
 			print_plugin_comp_cls_opt(stderr,
-				cfg->cmd_data.help.plugin_name->str,
-				cfg->cmd_data.help.component_name->str,
-				cfg->cmd_data.help.comp_cls_type);
+				cfg->cmd_data.help.cfg_component->plugin_name->str,
+				cfg->cmd_data.help.cfg_component->component_name->str,
+				cfg->cmd_data.help.cfg_component->type);
 			fprintf(stderr, "\n");
 			ret = -1;
 			goto end;
@@ -701,12 +701,12 @@ static int cmd_help(struct bt_config *cfg)
 
 		assert(comp_cls);
 
-		if (cfg->cmd_data.help.comp_cls_type !=
+		if (cfg->cmd_data.help.cfg_component->type !=
 				BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
-			if (strcmp(cfg->cmd_data.help.component_name->str,
+			if (strcmp(cfg->cmd_data.help.cfg_component->component_name->str,
 					comp_class_name) != 0 &&
 					type ==
-					cfg->cmd_data.help.comp_cls_type) {
+					cfg->cmd_data.help.cfg_component->type) {
 				bt_put(comp_cls);
 				continue;
 			}
@@ -714,7 +714,7 @@ static int cmd_help(struct bt_config *cfg)
 
 		printf("\n");
 		print_plugin_comp_cls_opt(stdout,
-			cfg->cmd_data.help.plugin_name->str,
+			cfg->cmd_data.help.cfg_component->plugin_name->str,
 			comp_class_name,
 			type);
 		printf("\n");