[Pcsclite-cvs-commit] PCSC/src readerfactory.c,1.52,1.53
rousseau@haydn.debian.org
rousseau@haydn.debian.org
Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv1664
Modified Files:
readerfactory.c
Log Message:
psFunctions.pvf* fields are function pointers so NULL is more appropriate
than 0
Index: readerfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- readerfactory.c 17 Jun 2004 08:04:56 -0000 1.52
+++ readerfactory.c 17 Jun 2004 08:11:22 -0000 1.53
@@ -853,7 +853,7 @@
/*
* Neither version of the IFD Handler was found - exit
*/
- rContext->psFunctions.pvfCreateChannel = 0;
+ rContext->psFunctions.pvfCreateChannel = NULL;
DebugLogA("IFDHandler functions missing");
@@ -897,7 +897,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfCloseChannel = 0;
+ rContext->psFunctions.pvfCloseChannel = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -908,7 +908,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfGetCapabilities = 0;
+ rContext->psFunctions.pvfGetCapabilities = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -919,7 +919,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfSetCapabilities = 0;
+ rContext->psFunctions.pvfSetCapabilities = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -929,7 +929,7 @@
"IFD_Set_Protocol_Parameters");
if (rv != SCARD_S_SUCCESS)
- rContext->psFunctions.pvfSetProtocol = 0;
+ rContext->psFunctions.pvfSetProtocol = NULL;
/*
* Not a completely required function
*/
@@ -939,7 +939,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfPowerICC = 0;
+ rContext->psFunctions.pvfPowerICC = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -948,7 +948,7 @@
&rContext->psFunctions.pvfSwallowICC, "IFD_Swallow_ICC");
if (rv != SCARD_S_SUCCESS)
- rContext->psFunctions.pvfSwallowICC = 0;
+ rContext->psFunctions.pvfSwallowICC = NULL;
/*
* Not a completely required function
*/
@@ -957,7 +957,7 @@
&rContext->psFunctions.pvfEjectICC, "IFD_Eject_ICC");
if (rv != SCARD_S_SUCCESS)
- rContext->psFunctions.pvfEjectICC = 0;
+ rContext->psFunctions.pvfEjectICC = NULL;
/*
* Not a completely required function
*/
@@ -966,7 +966,7 @@
&rContext->psFunctions.pvfConfiscateICC, "IFD_Confiscate_ICC");
if (rv != SCARD_S_SUCCESS)
- rContext->psFunctions.pvfConfiscateICC = 0;
+ rContext->psFunctions.pvfConfiscateICC = NULL;
/*
* Not a completely required function
*/
@@ -976,7 +976,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfTransmitICC = 0;
+ rContext->psFunctions.pvfTransmitICC = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -986,7 +986,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfICCPresent = 0;
+ rContext->psFunctions.pvfICCPresent = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -996,7 +996,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfICCAbsent = 0;
+ rContext->psFunctions.pvfICCAbsent = NULL;
/*
* Not a completely required function
*/
@@ -1017,7 +1017,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfCloseChannel = 0;
+ rContext->psFunctions.pvfCloseChannel = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -1028,7 +1028,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfGetCapabilities = 0;
+ rContext->psFunctions.pvfGetCapabilities = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -1039,7 +1039,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfSetCapabilities = 0;
+ rContext->psFunctions.pvfSetCapabilities = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -1050,7 +1050,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfSetProtocol = 0;
+ rContext->psFunctions.pvfSetProtocol = NULL;
/*
* Not a completely required function
*/
@@ -1061,7 +1061,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfPowerICC = 0;
+ rContext->psFunctions.pvfPowerICC = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -1071,7 +1071,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfTransmitICC = 0;
+ rContext->psFunctions.pvfTransmitICC = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -1081,7 +1081,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfControl = 0;
+ rContext->psFunctions.pvfControl = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -1091,7 +1091,7 @@
if (rv != SCARD_S_SUCCESS)
{
- rContext->psFunctions.pvfICCPresent = 0;
+ rContext->psFunctions.pvfICCPresent = NULL;
DebugLogA("IFDHandler functions missing");
exit(1);
}
@@ -1114,19 +1114,19 @@
* Zero out everything
*/
- rContext->psFunctions.pvfCreateChannel = 0;
- rContext->psFunctions.pvfCreateChannelByName = 0;
- rContext->psFunctions.pvfCloseChannel = 0;
- rContext->psFunctions.pvfGetCapabilities = 0;
- rContext->psFunctions.pvfSetCapabilities = 0;
- rContext->psFunctions.pvfSetProtocol = 0;
- rContext->psFunctions.pvfPowerICC = 0;
- rContext->psFunctions.pvfSwallowICC = 0;
- rContext->psFunctions.pvfEjectICC = 0;
- rContext->psFunctions.pvfConfiscateICC = 0;
- rContext->psFunctions.pvfTransmitICC = 0;
- rContext->psFunctions.pvfICCPresent = 0;
- rContext->psFunctions.pvfICCAbsent = 0;
+ rContext->psFunctions.pvfCreateChannel = NULL;
+ rContext->psFunctions.pvfCreateChannelByName = NULL;
+ rContext->psFunctions.pvfCloseChannel = NULL;
+ rContext->psFunctions.pvfGetCapabilities = NULL;
+ rContext->psFunctions.pvfSetCapabilities = NULL;
+ rContext->psFunctions.pvfSetProtocol = NULL;
+ rContext->psFunctions.pvfPowerICC = NULL;
+ rContext->psFunctions.pvfSwallowICC = NULL;
+ rContext->psFunctions.pvfEjectICC = NULL;
+ rContext->psFunctions.pvfConfiscateICC = NULL;
+ rContext->psFunctions.pvfTransmitICC = NULL;
+ rContext->psFunctions.pvfICCPresent = NULL;
+ rContext->psFunctions.pvfICCAbsent = NULL;
return SCARD_S_SUCCESS;
}