[svn-commits] tilghman: branch 1.6.0 r107961 - in /branches/1.6.0: ./ apps/ main/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Mar 12 00:47:37 2008
New Revision: 107961

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107961
Log:
Merged revisions 107960 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r107960 | tilghman | 2008-03-12 00:46:39 -0500 (Wed, 12 Mar 2008) | 4 lines

Revert several changes from revision 102525, as the changes were not
compatible, and, in fact, introduced regressions.
(Closes issue #12190)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_dumpchan.c
    branches/1.6.0/apps/app_zapras.c
    branches/1.6.0/main/loader.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_dumpchan.c?view=diff&rev=107961&r1=107960&r2=107961
==============================================================================
--- branches/1.6.0/apps/app_dumpchan.c (original)
+++ branches/1.6.0/apps/app_dumpchan.c Wed Mar 12 00:47:37 2008
@@ -141,8 +141,8 @@
 
 	pbx_builtin_serialize_variables(chan, &vars);
 	serialize_showchan(chan, info, sizeof(info));
-	if (level > 0)
-		ast_verb(level, "\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n", chan->name, line, info, vars->str, line);
+	if (option_verbose >= level)
+		ast_verbose("\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n", chan->name, line, info, vars->str, line);
 
 	return 0;
 }

Modified: branches/1.6.0/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_zapras.c?view=diff&rev=107961&r1=107960&r2=107961
==============================================================================
--- branches/1.6.0/apps/app_zapras.c (original)
+++ branches/1.6.0/apps/app_zapras.c Wed Mar 12 00:47:37 2008
@@ -165,13 +165,14 @@
 			if (res < 0) {
 				ast_log(LOG_WARNING, "wait4 returned %d: %s\n", res, strerror(errno));
 			}
-			if (WIFEXITED(status))
+			if (WIFEXITED(status)) {
 				ast_verb(3, "RAS on %s terminated with status %d\n", chan->name, WEXITSTATUS(status));
-			else if (WIFSIGNALED(status))
-				ast_verb(3, "RAS on %s terminated with signal %d\n", chan->name, WTERMSIG(status));
-			else
-				ast_verbose(VERBOSE_PREFIX_3 "RAS on %s terminated weirdly.\n", chan->name);
-
+			} else if (WIFSIGNALED(status)) {
+				ast_verb(3, "RAS on %s terminated with signal %d\n", 
+					 chan->name, WTERMSIG(status));
+			} else {
+				ast_verb(3, "RAS on %s terminated weirdly.\n", chan->name);
+			}
 			/* Throw back into audio mode */
 			x = 1;
 			ioctl(chan->fds[0], ZT_AUDIOMODE, &x);

Modified: branches/1.6.0/main/loader.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/loader.c?view=diff&rev=107961&r1=107960&r2=107961
==============================================================================
--- branches/1.6.0/main/loader.c (original)
+++ branches/1.6.0/main/loader.c Wed Mar 12 00:47:37 2008
@@ -697,8 +697,8 @@
 	case AST_MODULE_LOAD_SUCCESS:
 		if (!ast_fully_booted) {
 			ast_verb(1, "%s => (%s)\n", resource_name, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp)));
-			if (ast_opt_console)
-				ast_verb(0, ".");
+			if (ast_opt_console && !option_verbose)
+				ast_verbose( ".");
 		} else {
 			ast_verb(1, "Loaded %s => (%s)\n", resource_name, mod->info->description);
 		}