[Asterisk-cvs] asterisk cli.c,1.54,1.55 pbx.c,1.157,1.158

[markster at lists.digium.com]

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

Modified Files:
	cli.c pbx.c 
Log Message:
Fix small verboseness bugs (bug #2602)


Index: cli.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cli.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- cli.c	2 Oct 2004 00:58:31 -0000	1.54
+++ cli.c	8 Oct 2004 04:23:22 -0000	1.55
@@ -148,7 +148,7 @@
 		ast_cli(fd, "Verbosity was %d and is now %d\n", oldval, option_verbose);
 	else if (oldval > 0 && option_verbose > 0)
 		ast_cli(fd, "Verbosity is atleast %d\n", option_verbose);
-	else if (oldval > 0 && option_debug == 0)
+	else if (oldval > 0 && option_verbose == 0)
 		ast_cli(fd, "Verbosity is now OFF\n");
 	return RESULT_SUCCESS;
 }

Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- pbx.c	3 Oct 2004 16:15:44 -0000	1.157
+++ pbx.c	8 Oct 2004 04:23:22 -0000	1.158
@@ -1285,7 +1285,7 @@
 				pbx_substitute_variables(passdata, sizeof(passdata), c, e);
 				if (option_debug)
 						ast_log(LOG_DEBUG, "Launching '%s'\n", app->name);
-				else if (option_verbose > 2)
+				if (option_verbose > 2)
 						ast_verbose( VERBOSE_PREFIX_3 "Executing %s(\"%s\", \"%s\") %s\n", 
 								term_color(tmp, app->name, COLOR_BRCYAN, 0, sizeof(tmp)),
 								term_color(tmp2, c->name, COLOR_BRMAGENTA, 0, sizeof(tmp2)),