[asterisk-commits] tilghman: branch 1.6.2 r274282 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jul  6 17:10:23 2010
New Revision: 274282

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

........
  r274281 | tilghman | 2010-07-06 17:09:23 -0500 (Tue, 06 Jul 2010) | 2 lines
  
  Status shows all non-CRC4 lines as "yellow", even if "yellow" was not in the bitfield.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

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

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=274282&r1=274281&r2=274282
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Tue Jul  6 17:10:23 2010
@@ -15034,7 +15034,8 @@
 			s.lineconfig & DAHDI_CONFIG_AMI ? "AMI" :
 			"Unk",
 			s.lineconfig & DAHDI_CONFIG_CRC4 ?
-			s.lineconfig & DAHDI_CONFIG_NOTOPEN ? "CRC4/YEL" : "CRC4" : "YEL",
+				s.lineconfig & DAHDI_CONFIG_NOTOPEN ? "CRC4/YEL" : "CRC4" :
+				s.lineconfig & DAHDI_CONFIG_NOTOPEN ? "YEL" : "",
 			lbostr[s.lbo]
 			);
 	}