[Pcsclite-cvs-commit] PCSC/src ifdwrapper.c,1.18,1.19

[rousseau@haydn.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv2176

Modified Files:
	ifdwrapper.c 
Log Message:
psFunctions.pvf* fields are function pointers so NULL is more appropriate
than 0


Index: ifdwrapper.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/ifdwrapper.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ifdwrapper.c	10 Jun 2004 14:57:47 -0000	1.18
+++ ifdwrapper.c	17 Jun 2004 08:14:56 -0000	1.19
@@ -46,7 +46,7 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
+	vFunction = NULL;
 	ucValue[0] = 0;
 
 #ifndef PCSCLITE_STATIC_DRIVER
@@ -55,7 +55,7 @@
 	 */
 	vFunction = rContext->psFunctions.pvfSetProtocol;
 
-	if (vFunction == 0)
+	if (vFunction == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	if (rContext->dwVersion == IFD_HVERSION_1_0)
@@ -138,8 +138,8 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
-	vFunction1 = 0;
+	vFunction = NULL;
+	vFunction1 = NULL;
 
 #ifndef PCSCLITE_STATIC_DRIVER
 	/*
@@ -148,7 +148,7 @@
 	vFunction = rContext->psFunctions.pvfCreateChannel;
 	vFunction1 = rContext->psFunctions.pvfCreateChannelByName;
 
-	if (vFunction == 0)
+	if (vFunction == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	if (rContext->dwVersion == IFD_HVERSION_1_0)
@@ -229,7 +229,7 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
+	vFunction = NULL;
 
 #ifndef PCSCLITE_STATIC_DRIVER
 	/*
@@ -237,7 +237,7 @@
 	 */
 	vFunction = rContext->psFunctions.pvfCloseChannel;
 
-	if (vFunction == 0)
+	if (vFunction == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	if (rContext->dwVersion == IFD_HVERSION_1_0)
@@ -293,7 +293,7 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
+	vFunction = NULL;
 
 #ifndef PCSCLITE_STATIC_DRIVER
 	/*
@@ -301,7 +301,7 @@
 	 */
 	vFunction = rContext->psFunctions.pvfSetCapabilities;
 
-	if (vFunction == 0)
+	if (vFunction == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	if (rContext->dwVersion == IFD_HVERSION_1_0)
@@ -355,7 +355,7 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
+	vFunction = NULL;
 
 #ifndef PCSCLITE_STATIC_DRIVER
 	/*
@@ -363,7 +363,7 @@
 	 */
 	vFunction = rContext->psFunctions.pvfGetCapabilities;
 
-	if (vFunction == 0)
+	if (vFunction == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	if (rContext->dwVersion == IFD_HVERSION_1_0)
@@ -426,7 +426,7 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
+	vFunction = NULL;
 	dwStatus = 0;
 	dwProtocol = 0;
 	ucValue[0] = 0;
@@ -444,7 +444,7 @@
 	 */
 	vFunction = rContext->psFunctions.pvfPowerICC;
 
-	if (vFunction == 0)
+	if (vFunction == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	if (rContext->dwVersion == IFD_HVERSION_1_0)
@@ -525,8 +525,8 @@
 	 */
 	rv = 0;
 	rv1 = 0;
-	vFunctionA = 0;
-	vFunctionB = 0;
+	vFunctionA = NULL;
+	vFunctionB = NULL;
 	dwTag = 0;
 	dwCardStatus = 0;
 	ucValue[0] = 0;
@@ -538,10 +538,10 @@
 	vFunctionA = rContext->psFunctions.pvfICCPresent;
 	vFunctionB = rContext->psFunctions.pvfGetCapabilities;
 
-	if (vFunctionA == 0)
+	if (vFunctionA == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
-	if ((vFunctionB == 0) && (rContext->dwVersion == IFD_HVERSION_1_0))
+	if ((vFunctionB == NULL) && (rContext->dwVersion == IFD_HVERSION_1_0))
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	if (rContext->dwVersion == IFD_HVERSION_1_0)
@@ -683,7 +683,7 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
+	vFunction = NULL;
 	ucValue[0] = 0;
 
 	if (rContext->dwVersion != IFD_HVERSION_1_0)
@@ -695,7 +695,7 @@
 	 */
 	vFunction = rContext->psFunctions.pvfControl;
 
-	if (vFunction == 0)
+	if (vFunction == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	IFDH_control_v2 = (RESPONSECODE(*)(DWORD, PUCHAR, DWORD,
@@ -751,7 +751,7 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
+	vFunction = NULL;
 	ucValue[0] = 0;
 
 	if (rContext->dwVersion < IFD_HVERSION_3_0)
@@ -822,7 +822,7 @@
 	 * Zero out everything 
 	 */
 	rv = 0;
-	vFunction = 0;
+	vFunction = NULL;
 	ucValue[0] = 0;
 
 #ifndef PCSCLITE_STATIC_DRIVER
@@ -831,7 +831,7 @@
 	 */
 	vFunction = rContext->psFunctions.pvfTransmitICC;
 
-	if (vFunction == 0)
+	if (vFunction == NULL)
 		return SCARD_E_UNSUPPORTED_FEATURE;
 
 	if (rContext->dwVersion == IFD_HVERSION_1_0)