Fix: `test_packet_seq_num.in`: change expected disc. packets messages order

[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 c3d7250d737c63122e35256d606f4ddb07e55405..27f9a981208b75d4a8a3092bc51cd4d26974073e 100644 (file)
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -1993,7 +1993,10 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[],
        int ret;
        struct bt_config *cfg = NULL;
        const char *leftover;
-       bt_value *params = bt_value_null;
+       bt_value *params;
+
+       params = bt_value_null;
+       bt_value_get_ref(bt_value_null);
 
        *retcode = 0;
        cfg = bt_config_query_create(initial_plugin_paths);
@@ -2289,7 +2292,7 @@ void print_run_usage(FILE *fp)
        fprintf(fp, "                                    in the plugin PLUGIN, add it to the graph,\n");
        fprintf(fp, "                                    and optionally name it NAME (you can also\n");
        fprintf(fp, "                                    specify the name with --name)\n");
-       fprintf(fp, "  -C, --connect=CONNECTION          Connect two created components (see the\n");
+       fprintf(fp, "  -x, --connect=CONNECTION          Connect two created components (see the\n");
        fprintf(fp, "                                    expected format of CONNECTION below)\n");
        fprintf(fp, "      --key=KEY                     Set the current initialization string\n");
        fprintf(fp, "                                    parameter key to KEY (see --value)\n");
@@ -2383,7 +2386,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
        struct poptOption run_long_options[] = {
                { "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, NULL, NULL },
                { "component", 'c', POPT_ARG_STRING, NULL, OPT_COMPONENT, NULL, NULL },
-               { "connect", 'C', POPT_ARG_STRING, NULL, OPT_CONNECT, NULL, NULL },
+               { "connect", 'x', POPT_ARG_STRING, NULL, OPT_CONNECT, NULL, NULL },
                { "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
                { "key", '\0', POPT_ARG_STRING, NULL, OPT_KEY, NULL, NULL },
                { "name", 'n', POPT_ARG_STRING, NULL, OPT_NAME, NULL, NULL },
@@ -4099,7 +4102,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        append_implicit_component_param(
                                &implicit_text_args, "clock-gmt", "yes");
                        append_implicit_component_param(
-                               &implicit_trimmer_args, "clock-gmt", "yes");
+                               &implicit_trimmer_args, "gmt", "yes");
                        implicit_text_args.exists = true;
                        break;
                case OPT_CLOCK_OFFSET: