CLI: use -x as short option for --connection instead of -C

This is easier to identify on a `run` command line than -c and -C used
together, with arguments that look a lot similar.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index c3d7250d737c63122e35256d606f4ddb07e55405..f501ebcdcf26db8811e00a35c3b5bf2e8d3aa138 100644 (file)
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -2289,7 +2289,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 +2383,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 },

diff --git a/doc/man/babeltrace-run.1.txt b/doc/man/babeltrace-run.1.txt
index 802846c83226dd81cb07c1336f3120dfd82b3c6c..2c662295745a5f35ae0b8c93f7f7c1e9f31c5f23 100644 (file)
--- a/doc/man/babeltrace-run.1.txt
+++ b/doc/man/babeltrace-run.1.txt
@@ -250,7 +250,7 @@ opt:-v 'VALUE', opt:--value='VALUE'::
 
 Component connection
 ~~~~~~~~~~~~~~~~~~~~
-opt:-C 'CONN-RULE', opt:--connect='CONN-RULE'::
+opt:-x 'CONN-RULE', opt:--connect='CONN-RULE'::
     Add the connection rule 'CONN-RULE'. See
     <<connect-comps,Connect components>> for the format of 'CONN-RULE'.