[Pcsclite-cvs-commit] r6759 - trunk/PCSC/src

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2013-10-01 12:57:03 +0000 (Tue, 01 Oct 2013)
New Revision: 6759

Modified:
   trunk/PCSC/src/debug.c
   trunk/PCSC/src/debuglog.c
   trunk/PCSC/src/hotplug_linux.c
Log:
Use the COUNT_OF macro


Modified: trunk/PCSC/src/debug.c
===================================================================
--- trunk/PCSC/src/debug.c	2013-10-01 12:55:58 UTC (rev 6758)
+++ trunk/PCSC/src/debug.c	2013-10-01 12:57:03 UTC (rev 6759)
@@ -15,6 +15,7 @@
  */
 
 #include "config.h"
+#include "misc.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -65,7 +66,7 @@
 			unsigned int i;
 
 			/* for each known color terminal */
-			for (i = 0; i < sizeof(terms) / sizeof(terms[0]); i++)
+			for (i = 0; i < COUNT_OF(terms); i++)
 			{
 				/* we found a supported term? */
 				if (0 == strcmp(terms[i], term))

Modified: trunk/PCSC/src/debuglog.c
===================================================================
--- trunk/PCSC/src/debuglog.c	2013-10-01 12:55:58 UTC (rev 6758)
+++ trunk/PCSC/src/debuglog.c	2013-10-01 12:57:03 UTC (rev 6759)
@@ -238,7 +238,7 @@
 			unsigned int i;
 
 			/* for each known color terminal */
-			for (i = 0; i < sizeof(terms) / sizeof(terms[0]); i++)
+			for (i = 0; i < COUNT_OF(terms); i++)
 			{
 				/* we found a supported term? */
 				if (0 == strcmp(terms[i], term))

Modified: trunk/PCSC/src/hotplug_linux.c
===================================================================
--- trunk/PCSC/src/hotplug_linux.c	2013-10-01 12:55:58 UTC (rev 6758)
+++ trunk/PCSC/src/hotplug_linux.c	2013-10-01 12:57:03 UTC (rev 6759)
@@ -183,9 +183,9 @@
 #endif
 				listCount++;
 
-				if (listCount >= sizeof(bundleTracker)/sizeof(bundleTracker[0]))
+				if (listCount >= COUNT_OF(bundleTracker))
 				{
-					Log2(PCSC_LOG_CRITICAL, "Too many readers declared. Maximum is %zd", sizeof(bundleTracker)/sizeof(bundleTracker[0]));
+					Log2(PCSC_LOG_CRITICAL, "Too many readers declared. Maximum is %zd", COUNT_OF(bundleTracker));
 					goto end;
 				}
 			}