Standardize *get_*() functions

[babeltrace.git] / cli / babeltrace.c

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index 821772e191b048a2b444da3018e94444eb8b885d..0ef2491bd6384d8a01cd15bd704cedca9293b758 100644 (file)
--- a/cli/babeltrace.c
+++ b/cli/babeltrace.c
@@ -629,8 +629,8 @@ end:
 static
 void add_to_loaded_plugins(struct bt_plugin_set *plugin_set)
 {
-       int i;
-       int count;
+       int64_t i;
+       int64_t count;
 
        count = bt_plugin_set_get_plugin_count(plugin_set);
        assert(count >= 0);
@@ -864,7 +864,7 @@ static int cmd_help(struct bt_config *cfg)
        printf("  %sComponent classes%s: %d\n",
                        bt_common_color_bold(),
                        bt_common_color_reset(),
-                       bt_plugin_get_component_class_count(plugin));
+                       (int) bt_plugin_get_component_class_count(plugin));
 
 
        if (cfg->cmd_data.help.cfg_component->type !=
@@ -894,7 +894,7 @@ static int cmd_help(struct bt_config *cfg)
 
        for (i = 0; i < bt_plugin_get_component_class_count(plugin); i++) {
                struct bt_component_class *comp_cls =
-                       bt_plugin_get_component_class(plugin, i);
+                       bt_plugin_get_component_class_by_index(plugin, i);
                const char *comp_class_name =
                        bt_component_class_get_name(comp_cls);
                const char *comp_class_description =
@@ -1000,7 +1000,8 @@ static int cmd_list_plugins(struct bt_config *cfg)
 
                for (j = 0; j < component_classes_count; j++) {
                        struct bt_component_class *comp_class =
-                               bt_plugin_get_component_class(plugin, j);
+                               bt_plugin_get_component_class_by_index(
+                                       plugin, j);
                        const char *comp_class_name =
                                bt_component_class_get_name(comp_class);
                        const char *comp_class_description =