Rename: "float value" -> "real value"

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

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index 9d2b684edaa4e11a13d9a74aa613650f84de2ac0..f15455c758c11b911656c0204b44a4b2769d1d01 100644 (file)
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -298,7 +298,7 @@ int ini_handle_state(struct ini_parsing_state *state)
                }
                case G_TOKEN_FLOAT:
                        /* Positive floating point number */
-                       value = bt_value_float_create_init(
+                       value = bt_value_real_create_init(
                                state->scanner->value.v_float);
                        break;
                case G_TOKEN_STRING:
@@ -372,7 +372,7 @@ int ini_handle_state(struct ini_parsing_state *state)
                }
                case G_TOKEN_FLOAT:
                        /* Negative floating point number */
-                       value = bt_value_float_create_init(
+                       value = bt_value_real_create_init(
                                -state->scanner->value.v_float);
                        break;
                default:
@@ -789,7 +789,8 @@ struct bt_config_component *bt_config_component_create(
                goto error;
        }
 
-       bt_object_init(cfg_component, bt_config_component_destroy);
+       bt_object_init_shared(&cfg_component->base,
+               bt_config_component_destroy);
        cfg_component->type = type;
        cfg_component->plugin_name = g_string_new(plugin_name);
        if (!cfg_component->plugin_name) {
@@ -1499,7 +1500,7 @@ struct bt_config *bt_config_base_create(enum bt_config_command command,
                goto error;
        }
 
-       bt_object_init(cfg, bt_config_destroy);
+       bt_object_init_shared(&cfg->base, bt_config_destroy);
        cfg->command = command;
        cfg->command_needs_plugins = needs_plugins;
 
@@ -4774,7 +4775,7 @@ void print_gen_usage(FILE *fp)
        fprintf(fp, "\n");
        fprintf(fp, "  -d, --debug          Enable debug mode (same as --log-level=V)\n");
        fprintf(fp, "  -h, --help           Show this help and quit\n");
-       fprintf(fp, "      --log-level=LVL  Set all log levels to LVL (`N`, `V`, `D`,\n");
+       fprintf(fp, "  -l, --log-level=LVL  Set all log levels to LVL (`N`, `V`, `D`,\n");
        fprintf(fp, "                       `I`, `W` (default), `E`, or `F`)\n");
        fprintf(fp, "  -v, --verbose        Enable verbose mode (same as --log-level=I)\n");
        fprintf(fp, "  -V, --version        Show version and quit\n");
@@ -4881,7 +4882,8 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
                                 */
                                log_level = 'I';
                        }
-               } else if (strcmp(cur_arg, "--log-level") == 0) {
+               } else if (strcmp(cur_arg, "--log-level") == 0 ||
+                               strcmp(cur_arg, "-l") == 0) {
                        if (!next_arg) {
                                printf_err("Missing log level value for --log-level option\n");
                                *retcode = 1;
@@ -4900,6 +4902,16 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
                } else if (strncmp(cur_arg, "--log-level=", 12) == 0) {
                        const char *arg = &cur_arg[12];
 
+                       log_level = log_level_from_arg(arg);
+                       if (log_level == 'U') {
+                               printf_err("Invalid argument for --log-level option:\n    %s\n",
+                                       arg);
+                               *retcode = 1;
+                               goto end;
+                       }
+               } else if (strncmp(cur_arg, "-l", 2) == 0) {
+                       const char *arg = &cur_arg[2];
+
                        log_level = log_level_from_arg(arg);
                        if (log_level == 'U') {
                                printf_err("Invalid argument for --log-level option:\n    %s\n",