diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-18 19:54:18 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-18 19:54:18 +0000 |
commit | fcb999c01c22548f582f167e1b1e86f0c3a5a2fd (patch) | |
tree | cf63baa167f81c95d3dbf417f83681851decad80 /channels/chan_features.c | |
parent | fb23c753d30d181175c9ab0b635410b83e6fa980 (diff) |
merge qwell's CLI verbification work
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_features.c')
-rw-r--r-- | channels/chan_features.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/channels/chan_features.c b/channels/chan_features.c index 66b6da3e3..5f01738d2 100644 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -530,12 +530,19 @@ static int features_show(int fd, int argc, char **argv) } static char show_features_usage[] = -"Usage: feature show channels\n" +"Usage: feature list channels\n" " Provides summary information on feature channels.\n"; -static struct ast_cli_entry cli_show_features = { - { "feature", "show", "channels", NULL }, features_show, - "Show status of feature channels", show_features_usage, NULL }; +static struct ast_cli_entry cli_features_show_channels_deprecated = { + { "feature", "show", "channels", NULL }, + features_show, NULL, + NULL }; + +static struct ast_cli_entry cli_features[] = { + { { "feature", "list", "channels", NULL }, + features_show, "List status of feature channels", + show_features_usage, NULL, &cli_features_show_channels_deprecated }, +}; static int load_module(void) { @@ -544,7 +551,7 @@ static int load_module(void) ast_log(LOG_ERROR, "Unable to register channel class 'Feature'\n"); return -1; } - ast_cli_register(&cli_show_features); + ast_cli_register_multiple(cli_features, sizeof(cli_features) / sizeof(struct ast_cli_entry)); return 0; } @@ -553,7 +560,7 @@ static int unload_module(void) struct feature_pvt *p; /* First, take us out of the channel loop */ - ast_cli_unregister(&cli_show_features); + ast_cli_unregister_multiple(cli_features, sizeof(cli_features) / sizeof(struct ast_cli_entry)); ast_channel_unregister(&features_tech); if (!AST_LIST_LOCK(&features)) |