Rename VERBOSE log level to TRACE

[babeltrace.git] / src / cli / babeltrace2-cfg-cli-args.c

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index cad2b4aa4f37da40e6870d072e0f2a11f1172411..a6e61c1010052652de86af1ec07c2df2163595d1 100644 (file)
--- a/src/cli/babeltrace2-cfg-cli-args.c
+++ b/src/cli/babeltrace2-cfg-cli-args.c
@@ -1553,8 +1553,8 @@ int append_home_and_system_plugin_paths(bt_value *plugin_paths,
                if (bt_common_is_setuid_setgid()) {
                        BT_LOGI_STR("Skipping non-system plugin paths for setuid/setgid binary.");
                } else {
-                       char *home_plugin_dir =
-                               bt_common_get_home_plugin_path();
+                       char *home_plugin_dir = bt_common_get_home_plugin_path(
+                               BT_LOG_OUTPUT_LEVEL);
 
                        if (home_plugin_dir) {
                                ret = bt_config_append_plugin_paths(
@@ -4421,13 +4421,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        stream_intersection_mode = true;
                        break;
                case OPT_VERBOSE:
-                       if (*default_log_level != BT_LOG_VERBOSE &&
+                       if (*default_log_level != BT_LOG_TRACE &&
                                        *default_log_level != BT_LOG_DEBUG) {
                                *default_log_level = BT_LOG_INFO;
                        }
                        break;
                case OPT_DEBUG:
-                       *default_log_level = BT_LOG_VERBOSE;
+                       *default_log_level = BT_LOG_TRACE;
                        break;
                default:
                        break;
@@ -4986,17 +4986,17 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
 
                if (strcmp(cur_arg, "-d") == 0 ||
                                strcmp(cur_arg, "--debug") == 0) {
-                       default_log_level = BT_LOG_VERBOSE;
+                       default_log_level = BT_LOG_TRACE;
                } else if (strcmp(cur_arg, "-v") == 0 ||
                                strcmp(cur_arg, "--verbose") == 0) {
-                       if (default_log_level != BT_LOG_VERBOSE &&
+                       if (default_log_level != BT_LOG_TRACE &&
                                        default_log_level != BT_LOG_DEBUG) {
                                /*
                                 * Legacy: do not override a previous
                                 * --debug because --verbose and --debug
                                 * can be specified together (in this
                                 * case we want the lowest log level to
-                                * apply, VERBOSE).
+                                * apply, TRACE).
                                 */
                                default_log_level = BT_LOG_INFO;
                        }
@@ -5138,7 +5138,7 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
        }
 
        if (config) {
-               BT_ASSERT(default_log_level >= BT_LOG_VERBOSE);
+               BT_ASSERT(default_log_level >= BT_LOG_TRACE);
                config->log_level = default_log_level;
                config->command_name = command_name;
        }