Plugin development API: use self enumeration and plugin types

[babeltrace.git] / cli / babeltrace.c

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index ae1a9263454e3030c9b031554163d973cf7fbd0d..5abbcd0d8c065a3a3c51966f367de2245b66b6c6 100644 (file)
--- a/cli/babeltrace.c
+++ b/cli/babeltrace.c
@@ -56,7 +56,7 @@ static const char* log_level_env_var_names[] = {
        "BABELTRACE_SRC_CTF_FS_LOG_LEVEL",
        "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL",
        "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL",
-       "BABELTRACE_PLUGIN_CTF_NOTIF_ITER_LOG_LEVEL",
+       "BABELTRACE_PLUGIN_CTF_MSG_ITER_LOG_LEVEL",
        "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL",
        "BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL",
        "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL",
@@ -883,7 +883,7 @@ void print_plugin_info(const bt_plugin *plugin)
 {
        unsigned int major, minor, patch;
        const char *extra;
-       enum bt_plugin_status version_status;
+       enum bt_property_availability version_avail;
        const char *plugin_name;
        const char *path;
        const char *author;
@@ -895,7 +895,7 @@ void print_plugin_info(const bt_plugin *plugin)
        author = bt_plugin_get_author(plugin);
        license = bt_plugin_get_license(plugin);
        plugin_description = bt_plugin_get_description(plugin);
-       version_status = bt_plugin_get_version(plugin, &major, &minor,
+       version_avail = bt_plugin_get_version(plugin, &major, &minor,
                &patch, &extra);
        printf("%s%s%s%s:\n", bt_common_color_bold(),
                bt_common_color_fg_blue(), plugin_name,
@@ -907,7 +907,7 @@ void print_plugin_info(const bt_plugin *plugin)
                puts("  Built-in");
        }
 
-       if (version_status == BT_PLUGIN_STATUS_OK) {
+       if (version_avail == BT_PROPERTY_AVAILABILITY_AVAILABLE) {
                printf("  %sVersion%s: %u.%u.%u",
                        bt_common_color_bold(), bt_common_color_reset(),
                        major, minor, patch);