[Asterisk-cvs] asterisk pbx.c,1.195,1.196

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv13520

Modified Files:
	pbx.c 
Log Message:
Restore functionality of "show dialplan" with no arguments


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- pbx.c	9 Jan 2005 20:28:47 -0000	1.195
+++ pbx.c	12 Jan 2005 16:28:25 -0000	1.196
@@ -2996,7 +2996,7 @@
 
 	memset(&counters, 0, sizeof(counters));
 
-	if (argc != 2 && argc != 3) return -1;
+	if (argc != 2 && argc != 3) return RESULT_SHOWUSAGE;
 
 	/* we obtain [exten@]context? if yes, split them ... */
 	if (argc == 3) {
@@ -3018,7 +3018,7 @@
 			show_dialplan_helper(fd, context, exten, &counters, NULL);
 		}
 	} else {
-		return RESULT_SHOWUSAGE;
+		show_dialplan_helper(fd, NULL, NULL, &counters, NULL);
 	}
 
 	/* check for input failure and throw some error messages */