[svn-commits] russell: branch 1.6.0 r117486 - in /branches/1.6.0: ./ main/asterisk.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed May 21 13:13:08 2008
New Revision: 117486

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

................
r117481 | russell | 2008-05-21 13:12:19 -0500 (Wed, 21 May 2008) | 14 lines

Merged revisions 117479 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117479 | russell | 2008-05-21 13:11:51 -0500 (Wed, 21 May 2008) | 6 lines

Don't display the verbose marker for calls to ast_verbose() that do not include
a VERBOSE_PREFIX in front of the message.
(closes issue #12702)
Reported by: johnlange
Patched by me

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/asterisk.c

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

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=117486&r1=117485&r2=117486
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Wed May 21 13:13:08 2008
@@ -1445,8 +1445,12 @@
 	    (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_1))) {
 		fputs(tmp, stdout);
 		fputs(c, stdout);
-	} else
+	} else {
+		if (*s == 127) {
+			s++;
+		}
 		fputs(s, stdout);
+	}
 
 	fflush(stdout);