merge qwell's CLI verbification work

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43212 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 13 insertions, 6 deletions

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 3420ebb1a..99b3177b2 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -622,12 +622,19 @@ static int locals_show(int fd, int argc, char **argv)
 }
 
 static char show_locals_usage[] = 
-"Usage: local show channels\n"
+"Usage: local list channels\n"
 "       Provides summary information on active local proxy channels.\n";
 
-static struct ast_cli_entry cli_show_locals = {
-	{ "local", "show", "channels", NULL }, locals_show, 
-	"Show status of local channels", show_locals_usage, NULL };
+static struct ast_cli_entry cli_local_show_channels_deprecated = {
+	{ "local", "show", "channels", NULL },
+	locals_show, NULL,
+	NULL };
+
+static struct ast_cli_entry cli_local[] = {
+	{ { "local", "list", "channels", NULL },
+	locals_show, "List status of local channels",
+	show_locals_usage, NULL, &cli_local_show_channels_deprecated },
+};
 
 /*! \brief Load module into PBX, register channel */
 static int load_module(void)
@@ -637,7 +644,7 @@ static int load_module(void)
 		ast_log(LOG_ERROR, "Unable to register channel class 'Local'\n");
 		return -1;
 	}
-	ast_cli_register(&cli_show_locals);
+	ast_cli_register_multiple(cli_local, sizeof(cli_local) / sizeof(struct ast_cli_entry));
 	return 0;
 }
 
@@ -647,7 +654,7 @@ static int unload_module(void)
 	struct local_pvt *p = NULL;
 
 	/* First, take us out of the channel loop */
-	ast_cli_unregister(&cli_show_locals);
+	ast_cli_unregister_multiple(cli_local, sizeof(cli_local) / sizeof(struct ast_cli_entry));
 	ast_channel_unregister(&local_tech);
 	if (!AST_LIST_LOCK(&locals)) {
 		/* Hangup all interfaces if they have an owner */