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

[rousseau at alioth.debian.org]

Author: rousseau
Date: 2007-06-13 12:48:12 +0000 (Wed, 13 Jun 2007)
New Revision: 2561

Modified:
   trunk/PCSC/src/hotplug_libusb.c
   trunk/PCSC/src/pcscdaemon.c
   trunk/PCSC/src/readerfactory.c
Log:
use NULL instead of 0 for pointers (detected by sparse)


Modified: trunk/PCSC/src/hotplug_libusb.c
===================================================================
--- trunk/PCSC/src/hotplug_libusb.c	2007-06-13 12:47:21 UTC (rev 2560)
+++ trunk/PCSC/src/hotplug_libusb.c	2007-06-13 12:48:12 UTC (rev 2561)
@@ -97,7 +97,7 @@
 {
 	LONG rv;
 	DIR *hpDir;
-	struct dirent *currFP = 0;
+	struct dirent *currFP = NULL;
 	char fullPath[FILENAME_MAX];
 	char fullLibPath[FILENAME_MAX];
 	char keyValue[TOKEN_MAX_VALUE_SIZE];
@@ -145,14 +145,14 @@
 				rv = LTPBundleFindValueWithKey(fullPath,
 					PCSCLITE_HP_MANUKEY_NAME, keyValue, alias);
 				if (rv == 0)
-					driverTracker[listCount].manuID = strtol(keyValue, 0, 16);
+					driverTracker[listCount].manuID = strtol(keyValue, NULL, 16);
 
 				/* get ifdProductID */
 				rv = LTPBundleFindValueWithKey(fullPath,
 					PCSCLITE_HP_PRODKEY_NAME, keyValue, alias);
 				if (rv == 0)
 					driverTracker[listCount].productID =
-						strtol(keyValue, 0, 16);
+						strtol(keyValue, NULL, 16);
 
 				/* get ifdFriendlyName */
 				rv = LTPBundleFindValueWithKey(fullPath,
@@ -178,7 +178,7 @@
 					PCSCLITE_HP_CPCTKEY_NAME, keyValue, 0);
 				if (rv == 0)
 					driverTracker[listCount].ifdCapabilities = strtol(keyValue,
-						0, 16);
+						NULL, 16);
 
 #ifdef DEBUG_HOTPLUG
 				Log2(PCSC_LOG_INFO, "Found driver for: %s",
@@ -431,7 +431,7 @@
 
 	if (HPReadBundleValues())
 		SYS_ThreadCreate(&usbNotifyThread, THREAD_ATTR_DETACHED,
-			(PCSCLITE_THREAD_FUNCTION( )) HPEstablishUSBNotifications, 0);
+			(PCSCLITE_THREAD_FUNCTION( )) HPEstablishUSBNotifications, NULL);
 
 	return 0;
 }

Modified: trunk/PCSC/src/pcscdaemon.c
===================================================================
--- trunk/PCSC/src/pcscdaemon.c	2007-06-13 12:47:21 UTC (rev 2560)
+++ trunk/PCSC/src/pcscdaemon.c	2007-06-13 12:48:12 UTC (rev 2561)
@@ -229,18 +229,18 @@
 #ifdef HAVE_GETOPT_LONG
 	int option_index = 0;
 	static struct option long_options[] = {
-		{"config", 1, 0, 'c'},
-		{"foreground", 0, 0, 'f'},
-		{"help", 0, 0, 'h'},
-		{"version", 0, 0, 'v'},
-		{"apdu", 0, 0, 'a'},
-		{"debug", 0, 0, 'd'},
-		{"info", 0, 0, 0},
-		{"error", 0, 0, 'e'},
-		{"critical", 0, 0, 'C'},
-		{"hotplug", 0, 0, 'H'},
-		{"force-reader-polling", optional_argument, 0, 0},
-		{0, 0, 0, 0}
+		{"config", 1, NULL, 'c'},
+		{"foreground", 0, NULL, 'f'},
+		{"help", 0, NULL, 'h'},
+		{"version", 0, NULL, 'v'},
+		{"apdu", 0, NULL, 'a'},
+		{"debug", 0, NULL, 'd'},
+		{"info", 0, NULL, 0},
+		{"error", 0, NULL, 'e'},
+		{"critical", 0, NULL, 'C'},
+		{"hotplug", 0, NULL, 'H'},
+		{"force-reader-polling", optional_argument, NULL, 0},
+		{NULL, 0, NULL, 0}
 	};
 #endif
 #define OPT_STRING "c:fdhvaeCH"

Modified: trunk/PCSC/src/readerfactory.c
===================================================================
--- trunk/PCSC/src/readerfactory.c	2007-06-13 12:47:21 UTC (rev 2560)
+++ trunk/PCSC/src/readerfactory.c	2007-06-13 12:48:12 UTC (rev 2561)
@@ -164,13 +164,13 @@
 		sizeof((sReadersContexts[dwContext])->lpcDevice));
 	(sReadersContexts[dwContext])->dwVersion = 0;
 	(sReadersContexts[dwContext])->dwPort = dwPort;
-	(sReadersContexts[dwContext])->mMutex = 0;
+	(sReadersContexts[dwContext])->mMutex = NULL;
 	(sReadersContexts[dwContext])->dwBlockStatus = 0;
 	(sReadersContexts[dwContext])->dwContexts = 0;
 	(sReadersContexts[dwContext])->pthThread = 0;
 	(sReadersContexts[dwContext])->dwLockId = 0;
 	(sReadersContexts[dwContext])->LockCount = 0;
-	(sReadersContexts[dwContext])->vHandle = 0;
+	(sReadersContexts[dwContext])->vHandle = NULL;
 	(sReadersContexts[dwContext])->pdwFeeds = NULL;
 	(sReadersContexts[dwContext])->pdwMutex = NULL;
 	(sReadersContexts[dwContext])->dwIdentity =
@@ -205,7 +205,7 @@
 		if (rv == IFD_SUCCESS && dwGetSize == 1 && ucThread[0] == 1)
 		{
 			Log1(PCSC_LOG_INFO, "Driver is thread safe");
-			(sReadersContexts[dwContext])->mMutex = 0;
+			(sReadersContexts[dwContext])->mMutex = NULL;
 			(sReadersContexts[dwContext])->pdwMutex = NULL;
 		}
 		else
@@ -253,7 +253,7 @@
 
 		(sReadersContexts[dwContext])->dwVersion = 0;
 		(sReadersContexts[dwContext])->dwPort = 0;
-		(sReadersContexts[dwContext])->vHandle = 0;
+		(sReadersContexts[dwContext])->vHandle = NULL;
 		(sReadersContexts[dwContext])->readerState = NULL;
 		(sReadersContexts[dwContext])->dwIdentity = 0;
 
@@ -430,7 +430,7 @@
 
 			(sReadersContexts[dwContextB])->dwVersion = 0;
 			(sReadersContexts[dwContextB])->dwPort = 0;
-			(sReadersContexts[dwContextB])->vHandle = 0;
+			(sReadersContexts[dwContextB])->vHandle = NULL;
 			(sReadersContexts[dwContextB])->readerState = NULL;
 			(sReadersContexts[dwContextB])->dwIdentity = 0;
 
@@ -529,13 +529,13 @@
 		sContext->lpcDevice[0] = 0;
 		sContext->dwVersion = 0;
 		sContext->dwPort = 0;
-		sContext->mMutex = 0;
+		sContext->mMutex = NULL;
 		sContext->dwBlockStatus = 0;
 		sContext->dwContexts = 0;
 		sContext->dwSlot = 0;
 		sContext->dwLockId = 0;
 		sContext->LockCount = 0;
-		sContext->vHandle = 0;
+		sContext->vHandle = NULL;
 		sContext->dwIdentity = 0;
 		sContext->readerState = NULL;
 
@@ -1026,7 +1026,7 @@
 		DYN_CloseLibrary(&rContext->vHandle);
 	}
 
-	rContext->vHandle = 0;
+	rContext->vHandle = NULL;
 
 	return SCARD_S_SUCCESS;
 }