[asterisk-commits] seanbright: branch 1.6.0 r128739 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Mon Jul  7 15:51:48 2008
New Revision: 128739

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

................
r128738 | seanbright | 2008-07-07 16:50:29 -0400 (Mon, 07 Jul 2008) | 17 lines

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

........
r128737 | seanbright | 2008-07-07 16:47:56 -0400 (Mon, 07 Jul 2008) | 9 lines

Remove spurious trailing whitespace from log messages and fix a spelling error
in a log message.

(closes issue #13017)
Reported by: jpgrayson
Patches:
      chan_iax2_space_after_newline.patch uploaded by jpgrayson (license 492)
      chan_iax2_spelling.patch uploaded by jpgrayson (license 492)

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

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

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=128739&r1=128738&r2=128739
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Mon Jul  7 15:51:48 2008
@@ -7781,7 +7781,7 @@
 		if (!iaxs[fr->callno]) {
 			/* drop it */
 		} else if (iaxs[fr->callno]->voiceformat == 0) {
-			ast_log(LOG_WARNING, "Received trunked frame before first full voice frame\n ");
+			ast_log(LOG_WARNING, "Received trunked frame before first full voice frame\n");
 			iax2_vnak(fr->callno);
 		} else {
 			f.subclass = iaxs[fr->callno]->voiceformat;
@@ -9334,7 +9334,7 @@
 		if (iaxs[fr->callno]->videoformat > 0) 
 			f.subclass = iaxs[fr->callno]->videoformat | (ntohs(vh->ts) & 0x8000 ? 1 : 0);
 		else {
-			ast_log(LOG_WARNING, "Received mini frame before first full video frame\n ");
+			ast_log(LOG_WARNING, "Received mini frame before first full video frame\n");
 			iax2_vnak(fr->callno);
 			ast_mutex_unlock(&iaxsl[fr->callno]);
 			return 1;