From d5128b09594b58082759e74504ece9f7d0cb5482 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 18 Dec 2018 09:49:38 -0500 Subject: [PATCH] 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 --- cli/babeltrace-cfg-cli-args.c | 4 ++-- doc/man/babeltrace-run.1.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c index c3d7250d..f501ebcd 100644 --- 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 802846c8..2c662295 100644 --- 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 <> for the format of 'CONN-RULE'. -- 2.34.1