bkruse: trunk r1357 - in /trunk: ./ tools/ztscan.c

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Thu Aug 16 16:35:09 2007
New Revision: 1357

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1357
Log:
Merged revisions 1356 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1356 | bkruse | 2007-08-16 16:33:19 -0500 (Thu, 16 Aug 2007) | 1 line

Patch for ztscan.c. If the total channels in the structure is not set to 24 or 31, it is not a digital card. Please correct me if I am wrong.
........

Modified:
    trunk/   (props changed)
    trunk/tools/ztscan.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Aug 16 16:35:09 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1291,1293,1298-1300,1326,1332,1336-1338,1342,1346,1349
+/branches/1.4:1-1291,1293,1298-1300,1326,1332,1336-1338,1342,1346,1349,1356

Modified: trunk/tools/ztscan.c
URL: http://svn.digium.com/view/asterisk-gui/trunk/tools/ztscan.c?view=diff&rev=1357&r1=1356&r2=1357
==============================================================================
--- trunk/tools/ztscan.c (original)
+++ trunk/tools/ztscan.c Thu Aug 16 16:35:09 2007
@@ -77,6 +77,10 @@
 			fprintf(stderr, "Unable to get span info on span %d: %s\n", span, strerror(errno)); 
 		return NULL;
 	}
+	/* If this is not a digital card, skip it. */
+	if(s[span].totalchannels != 24 || s[span].totalchannels != 31) 
+		return NULL;
+
 	strcpy(alarms, "");
 	if (s[span].alarms > 0) {
 		if (s[span].alarms & ZT_ALARM_BLUE)