From c771976500a03e9be6ca67f3c3ccc31f6c32f232 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 2 Nov 2006 23:00:20 +0000 Subject: Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments" git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@47051 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_agi.c | 6 +++--- res/res_crypto.c | 4 ++-- res/res_features.c | 2 +- res/res_indications.c | 4 ++-- res/res_musiconhold.c | 4 ++-- res/res_odbc.c | 11 +++-------- 6 files changed, 13 insertions(+), 18 deletions(-) (limited to 'res') diff --git a/res/res_agi.c b/res/res_agi.c index 4d9510f84..5a9a40c17 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -95,7 +95,7 @@ static char *descrip = "variable to \"no\" before executing the AGI application.\n" " Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n" "on file descriptor 3\n\n" -" Use the CLI command 'show agi' to list available agi commands\n" +" Use the CLI command 'agi show' to list available agi commands\n" " This application sets the following channel variable upon completion:\n" " AGISTATUS The status of the attempt to the run the AGI script\n" " text string, one of SUCCESS | FAILED | HANGUP\n"; @@ -2084,7 +2084,7 @@ static int deadagi_exec(struct ast_channel *chan, void *data) } static char showagi_help[] = -"Usage: agi list [topic]\n" +"Usage: agi show [topic]\n" " When called with a topic as an argument, displays usage\n" " information on the given command. If called without a\n" " topic, it provides a list of AGI commands.\n"; @@ -2118,7 +2118,7 @@ static struct ast_cli_entry cli_agi[] = { agi_no_debug, "Disable AGI debugging", no_debug_usage, NULL, &cli_agi_no_debug_deprecated }, - { { "agi", "list", NULL }, + { { "agi", "show", NULL }, handle_showagi, "List AGI commands or specific help", showagi_help, NULL, &cli_show_agi_deprecated }, diff --git a/res/res_crypto.c b/res/res_crypto.c index 586dd77cf..eea8356af 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -554,7 +554,7 @@ static int init_keys(int fd, int argc, char *argv[]) } static char show_key_usage[] = -"Usage: keys list\n" +"Usage: keys show\n" " Displays information about RSA keys known by Asterisk\n"; static char init_keys_usage[] = @@ -572,7 +572,7 @@ static struct ast_cli_entry cli_init_keys_deprecated = { NULL }; static struct ast_cli_entry cli_crypto[] = { - { { "keys", "list", NULL }, + { { "keys", "show", NULL }, show_keys, "Displays RSA key information", show_key_usage, NULL, &cli_show_keys_deprecated }, diff --git a/res/res_features.c b/res/res_features.c index b2cca3c15..86d12cefc 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1927,7 +1927,7 @@ static struct ast_cli_entry cli_show_features_deprecated = { NULL }; static struct ast_cli_entry cli_features[] = { - { { "feature", "list", NULL }, + { { "feature", "show", NULL }, handle_showfeatures, "Lists configured features", showfeatures_help, NULL, &cli_show_features_deprecated }, diff --git a/res/res_indications.c b/res/res_indications.c index 34ddf1e31..ed8a24b33 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -64,7 +64,7 @@ static char help_remove_indication[] = " Remove the given indication from the country.\n"; static char help_show_indications[] = -"Usage: indication list [ ...]\n" +"Usage: indication show [ ...]\n" " Display either a condensed for of all country/indications, or the\n" " indications for the specified countries.\n"; @@ -359,7 +359,7 @@ static struct ast_cli_entry cli_indications[] = { handle_remove_indication, "Remove the given indication from the country", help_remove_indication, NULL }, - { { "indication", "list", NULL }, + { { "indication", "show", NULL }, handle_show_indications, "Display a list of all countries/indications", help_show_indications, NULL, &cli_show_indications_deprecated }, }; diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 6da58427f..56e8a1d28 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1206,11 +1206,11 @@ static struct ast_cli_entry cli_moh[] = { moh_cli, "Music On Hold", "Music On Hold" }, - { { "moh", "list", "classes"}, + { { "moh", "show", "classes"}, moh_classes_show, "List MOH classes", "Lists all MOH classes", NULL, &cli_moh_classes_show_deprecated }, - { { "moh", "list", "files"}, + { { "moh", "show", "files"}, cli_files_show, "List MOH file-based classes", "Lists all loaded file-based MOH classes and their files", NULL, &cli_moh_files_show_deprecated }, }; diff --git a/res/res_odbc.c b/res/res_odbc.c index 444e4f4d5..036b02151 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -338,19 +338,14 @@ static int odbc_show_command(int fd, int argc, char **argv) } static char show_usage[] = -"Usage: odbc list []\n" +"Usage: odbc show []\n" " List settings of a particular ODBC class.\n" " or, if not specified, all classes.\n"; -static struct ast_cli_entry cli_odbc_show_deprecated = { - { "odbc", "show", NULL }, - odbc_show_command, NULL, - NULL }; - static struct ast_cli_entry cli_odbc[] = { - { { "odbc", "list", NULL }, + { { "odbc", "show", NULL }, odbc_show_command, "List ODBC DSN(s)", - show_usage, NULL, &cli_odbc_show_deprecated }, + show_usage }, }; static int odbc_register_class(struct odbc_class *class, int connect) -- cgit v1.2.3