More changes making the CLI more consistent with "category verb arguments" (continuation of issue 8236)

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@47053 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 13 deletions

diff --git a/main/udptl.c b/main/udptl.c
index bd3a3acb4..c275b98bc 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -1135,18 +1135,9 @@ static int udptl_do_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int udptl_nodebug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc !=3)
-		return RESULT_SHOWUSAGE;
-	udptldebug = 0;
-	ast_cli(fd,"UDPTL Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int udptl_nodebug(int fd, int argc, char *argv[])
 {
-	if (argc != 2)
+	if (argc != 3)
 		return RESULT_SHOWUSAGE;
 	udptldebug = 0;
 	ast_cli(fd,"UDPTL Debugging Disabled\n");
@@ -1158,12 +1149,12 @@ static char debug_usage[] =
   "       Enable dumping of all UDPTL packets to and from host.\n";
 
 static char nodebug_usage[] =
-  "Usage: udptl nodebug\n"
+  "Usage: udptl debug off\n"
   "       Disable all UDPTL debugging\n";
 
 static struct ast_cli_entry cli_udptl_no_debug = {
 	{ "udptl", "no", "debug", NULL },
-	udptl_nodebug_deprecated, NULL,
+	udptl_nodebug, NULL,
 	NULL };
 
 static struct ast_cli_entry cli_udptl[] = {
@@ -1175,7 +1166,7 @@ static struct ast_cli_entry cli_udptl[] = {
 	udptl_do_debug, "Enable UDPTL debugging on IP",
 	debug_usage },
 
-	{ { "udptl", "nodebug", NULL },
+	{ { "udptl", "debug", "off", NULL },
 	udptl_nodebug, "Disable UDPTL debugging",
 	nodebug_usage, NULL, &cli_udptl_no_debug },
 };