[Pcsclite-cvs-commit] PCSC/src atrhandler.c,1.10,1.11 dyn_hpux.c,1.8,1.9 dyn_unix.c,1.10,1.11 ifdwrapper.c,1.20,1.21 readerfactory.c,1.55,1.56 winscard.c,1.34,1.35 winscard_clnt.c,1.38,1.39
rousseau@haydn.debian.org
rousseau@haydn.debian.org
Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv18359
Modified Files:
atrhandler.c dyn_hpux.c dyn_unix.c ifdwrapper.c
readerfactory.c winscard.c winscard_clnt.c
Log Message:
local variables reorganisations:
- remove unused variables
- remove useless initialisations
- move declaration in the inner block the variable is used
Index: atrhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/atrhandler.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- atrhandler.c 10 Jun 2004 14:57:47 -0000 1.10
+++ atrhandler.c 21 Jun 2004 07:40:26 -0000 1.11
@@ -32,13 +32,12 @@
USHORT p;
UCHAR K, TCK; /* MSN of T0/Check Sum */
UCHAR Y1i, T; /* MSN/LSN of TDi */
- short TAi, TBi, TCi, TDi; /* Interface characters */
- int i = 1; /* value of the index in TAi, TBi, etc. */
+ int i = 1; /* value of the index in TAi, TBi, etc. */
/*
* Zero out everything
*/
- p = K = TCK = Y1i = T = TAi = TBi = TCi = TDi = 0;
+ p = K = TCK = Y1i = T = 0;
#ifdef ATR_DEBUG
DebugXxd("ATR: ", pucAtr, dwLength);
@@ -93,6 +92,8 @@
*/
do
{
+ short TAi, TBi, TCi, TDi; /* Interface characters */
+
TAi = (Y1i & 0x01) ? pucAtr[p++] : -1;
TBi = (Y1i & 0x02) ? pucAtr[p++] : -1;
TCi = (Y1i & 0x04) ? pucAtr[p++] : -1;
Index: dyn_hpux.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_hpux.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dyn_hpux.c 10 Jun 2004 14:57:47 -0000 1.8
+++ dyn_hpux.c 21 Jun 2004 07:40:26 -0000 1.9
@@ -33,7 +33,7 @@
if (myHandle == 0)
{
- DebugLogB("%s: %s", pcLibrary, strerror(errno));
+ DebugLogC("%s: %s", pcLibrary, strerror(errno));
return SCARD_F_UNKNOWN_ERROR;
}
@@ -45,10 +45,6 @@
{
int rv;
- /*
- * Zero out everything
- */
- rv = 0;
rv = shl_unload((shl_t) * pvLHandle);
*pvLHandle = 0;
@@ -66,15 +62,6 @@
{
int rv;
- char *pcFunctionName;
-
- /*
- * Zero out everything
- */
- rv = 0;
- pcFunctionName = 0;
-
- pcFunctionName = pcFunction;
*pvFHandle = 0;
rv = shl_findsym((shl_t *) & pvLHandle, pcFunction, TYPE_PROCEDURE,
@@ -82,7 +69,7 @@
if (rv == -1)
{
- DebugLogB("%s: %s", pcFunction, strerror(errno));
+ DebugLogC("%s: %s", pcFunction, strerror(errno));
rv = SCARD_F_UNKNOWN_ERROR;
}
else
Index: dyn_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_unix.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dyn_unix.c 10 Jun 2004 14:57:47 -0000 1.10
+++ dyn_unix.c 21 Jun 2004 07:40:26 -0000 1.11
@@ -57,11 +57,6 @@
char pcFunctionName[256];
int rv;
- /*
- * Zero out everything
- */
- rv = 0;
-
/* Some platforms might need a leading underscore for the symbol */
snprintf(pcFunctionName, sizeof(pcFunctionName), "_%s", pcFunction);
Index: ifdwrapper.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/ifdwrapper.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ifdwrapper.c 18 Jun 2004 08:32:01 -0000 1.20
+++ ifdwrapper.c 21 Jun 2004 07:40:26 -0000 1.21
@@ -31,26 +31,17 @@
LONG IFDSetPTS(PREADER_CONTEXT rContext, DWORD dwProtocol, UCHAR ucFlags,
UCHAR ucPTS1, UCHAR ucPTS2, UCHAR ucPTS3)
{
- RESPONSECODE rv;
- LPVOID vFunction;
+ RESPONSECODE rv = 0;
UCHAR ucValue[1];
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
RESPONSECODE(*IFD_set_protocol_parameters) (DWORD, UCHAR, UCHAR,
UCHAR, UCHAR) = NULL;
RESPONSECODE(*IFDH_set_protocol_parameters) (DWORD, DWORD, UCHAR,
UCHAR, UCHAR, UCHAR) = NULL;
-#endif
/*
- * Zero out everything
- */
- rv = 0;
- vFunction = NULL;
- ucValue[0] = 0;
-
-#ifndef PCSCLITE_STATIC_DRIVER
- /*
* Make sure the symbol exists in the driver
*/
vFunction = rContext->psFunctions.pvfSetProtocol;
@@ -124,24 +115,15 @@
LONG IFDOpenIFD(PREADER_CONTEXT rContext)
{
- RESPONSECODE rv;
- LPVOID vFunction;
- LPVOID vFunction1;
+ RESPONSECODE rv = 0;
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
+ LPVOID vFunction1;
RESPONSECODE(*IO_create_channel) (DWORD) = NULL;
RESPONSECODE(*IFDH_create_channel) (DWORD, DWORD) = NULL;
RESPONSECODE(*IFDH_create_channel_by_name) (DWORD, LPTSTR) = NULL;
-#endif
-
- /*
- * Zero out everything
- */
- rv = 0;
- vFunction = NULL;
- vFunction1 = NULL;
-#ifndef PCSCLITE_STATIC_DRIVER
/*
* Make sure the symbol exists in the driver
*/
@@ -217,22 +199,14 @@
LONG IFDCloseIFD(PREADER_CONTEXT rContext)
{
- RESPONSECODE rv;
- LPVOID vFunction;
+ RESPONSECODE rv = 0;
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
RESPONSECODE(*IO_close_channel) () = NULL;
RESPONSECODE(*IFDH_close_channel) (DWORD) = NULL;
-#endif
/*
- * Zero out everything
- */
- rv = 0;
- vFunction = NULL;
-
-#ifndef PCSCLITE_STATIC_DRIVER
- /*
* Make sure the symbol exists in the driver
*/
vFunction = rContext->psFunctions.pvfCloseChannel;
@@ -280,22 +254,13 @@
LONG IFDSetCapabilities(PREADER_CONTEXT rContext, DWORD dwTag,
DWORD dwLength, PUCHAR pucValue)
{
- LONG rv;
- LPVOID vFunction;
+ LONG rv = 0;
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
RESPONSECODE(*IFD_set_capabilities) (DWORD, PUCHAR) = NULL;
- RESPONSECODE(*IFDH_set_capabilities) (DWORD, DWORD, DWORD, PUCHAR) =
- NULL;
-#endif
-
- /*
- * Zero out everything
- */
- rv = 0;
- vFunction = NULL;
+ RESPONSECODE(*IFDH_set_capabilities) (DWORD, DWORD, DWORD, PUCHAR) = NULL;
-#ifndef PCSCLITE_STATIC_DRIVER
/*
* Make sure the symbol exists in the driver
*/
@@ -342,22 +307,13 @@
LONG IFDGetCapabilities(PREADER_CONTEXT rContext, DWORD dwTag,
PDWORD pdwLength, PUCHAR pucValue)
{
- LONG rv;
- LPVOID vFunction;
+ LONG rv = 0;
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
RESPONSECODE(*IFD_get_capabilities) (DWORD, PUCHAR) = NULL;
- RESPONSECODE(*IFDH_get_capabilities) (DWORD, DWORD, PDWORD, PUCHAR) =
- NULL;
-#endif
-
- /*
- * Zero out everything
- */
- rv = 0;
- vFunction = NULL;
+ RESPONSECODE(*IFDH_get_capabilities) (DWORD, DWORD, PDWORD, PUCHAR) = NULL;
-#ifndef PCSCLITE_STATIC_DRIVER
/*
* Make sure the symbol exists in the driver
*/
@@ -412,12 +368,12 @@
PUCHAR pucAtr, PDWORD pdwAtrLen)
{
RESPONSECODE rv, ret;
- LPVOID vFunction;
SMARTCARD_EXTENSION sSmartCard;
DWORD dwStatus;
UCHAR ucValue[1];
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
RESPONSECODE(*IFD_power_icc) (DWORD) = NULL;
RESPONSECODE(*IFDH_power_icc) (DWORD, DWORD, PUCHAR, PDWORD) = NULL;
#endif
@@ -426,7 +382,6 @@
* Zero out everything
*/
rv = 0;
- vFunction = NULL;
dwStatus = 0;
ucValue[0] = 0;
@@ -514,31 +469,18 @@
LONG IFDStatusICC(PREADER_CONTEXT rContext, PDWORD pdwStatus,
PUCHAR pucAtr, PDWORD pdwAtrLen)
{
- RESPONSECODE rv, rv1;
- LPVOID vFunctionA, vFunctionB;
- DWORD dwTag, dwCardStatus;
+ RESPONSECODE rv = 0;
+ DWORD dwTag = 0, dwCardStatus = 0;
SMARTCARD_EXTENSION sSmartCard;
- UCHAR ucValue[1];
+ UCHAR ucValue[1] = "\x00";
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunctionA, vFunctionB;
RESPONSECODE(*IFD_is_icc_present) () = NULL;
RESPONSECODE(*IFDH_icc_presence) (DWORD) = NULL;
RESPONSECODE(*IFD_get_capabilities) (DWORD, PUCHAR) = NULL;
-#endif
/*
- * Zero out everything
- */
- rv = 0;
- rv1 = 0;
- vFunctionA = NULL;
- vFunctionB = NULL;
- dwTag = 0;
- dwCardStatus = 0;
- ucValue[0] = 0;
-
-#ifndef PCSCLITE_STATIC_DRIVER
- /*
* Make sure the symbol exists in the driver
*/
vFunctionA = rContext->psFunctions.pvfICCPresent;
@@ -676,21 +618,13 @@
LONG IFDControl_v2(PREADER_CONTEXT rContext, PUCHAR TxBuffer,
DWORD TxLength, PUCHAR RxBuffer, PDWORD RxLength)
{
- RESPONSECODE rv;
- LPVOID vFunction;
- UCHAR ucValue[1];
+ RESPONSECODE rv = 0;
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
RESPONSECODE(*IFDH_control_v2) (DWORD, PUCHAR, DWORD, PUCHAR, PDWORD);
#endif
- /*
- * Zero out everything
- */
- rv = 0;
- vFunction = NULL;
- ucValue[0] = 0;
-
if (rContext->dwVersion != IFD_HVERSION_1_0)
rv = SCARD_E_UNSUPPORTED_FEATURE;
@@ -744,21 +678,13 @@
LPCVOID TxBuffer, DWORD TxLength, LPVOID RxBuffer, DWORD RxLength,
LPDWORD BytesReturned)
{
- RESPONSECODE rv;
- LPVOID vFunction;
- UCHAR ucValue[1];
+ RESPONSECODE rv = 0;
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
RESPONSECODE(*IFDH_control) (DWORD, DWORD, LPCVOID, DWORD, LPVOID, DWORD, LPDWORD);
#endif
- /*
- * Zero out everything
- */
- rv = 0;
- vFunction = NULL;
- ucValue[0] = 0;
-
if (rContext->dwVersion < IFD_HVERSION_3_0)
rv = SCARD_E_UNSUPPORTED_FEATURE;
@@ -809,11 +735,11 @@
PUCHAR pucTxBuffer, DWORD dwTxLength, PUCHAR pucRxBuffer,
PDWORD pdwRxLength, PSCARD_IO_HEADER pioRxPci)
{
- RESPONSECODE rv;
- LPVOID vFunction;
- UCHAR ucValue[1];
+ RESPONSECODE rv = 0;
+ UCHAR ucValue[1] = "\x00";
#ifndef PCSCLITE_STATIC_DRIVER
+ LPVOID vFunction;
RESPONSECODE(*IFD_transmit_to_icc) (SCARD_IO_HEADER, PUCHAR, DWORD,
PUCHAR, DWORD *, PSCARD_IO_HEADER) = NULL;
RESPONSECODE(*IFDH_transmit_to_icc) (DWORD, SCARD_IO_HEADER, PUCHAR,
@@ -822,13 +748,6 @@
/* log the APDU */
DebugLogCategory(DEBUG_CATEGORY_APDU, pucTxBuffer, dwTxLength);
-
- /*
- * Zero out everything
- */
- rv = 0;
- vFunction = NULL;
- ucValue[0] = 0;
#ifndef PCSCLITE_STATIC_DRIVER
/*
Index: readerfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/readerfactory.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- readerfactory.c 18 Jun 2004 08:44:31 -0000 1.55
+++ readerfactory.c 21 Jun 2004 07:40:26 -0000 1.56
@@ -62,22 +62,10 @@
LONG RFAddReader(LPTSTR lpcReader, DWORD dwPort, LPTSTR lpcLibrary, LPTSTR lpcDevice)
{
- DWORD dwContext, dwGetSize;
+ DWORD dwContext = 0, dwGetSize;
UCHAR ucGetData[1], ucThread[1];
LONG rv, parentNode;
-
- int i, j, tmplen, psize;
-
- /*
- * Zero out everything
- */
- dwContext = 0;
- rv = 0;
- i = 0;
- psize = 0;
- ucGetData[0] = 0;
- ucThread[0] = 0;
- tmplen = 0;
+ int i, j;
if (lpcReader == 0 || lpcLibrary == 0)
return SCARD_E_INVALID_VALUE;
@@ -92,6 +80,7 @@
if ((sReadersContexts[i])->vHandle != 0)
{
char lpcStripReader[MAX_READERNAME];
+ int tmplen;
/* get the reader name without the reader and slot numbers */
strncpy(lpcStripReader, (sReadersContexts[i])->lpcReader,
@@ -518,7 +507,6 @@
LPTSTR libraryName, DWORD dwPort, DWORD dwSlot)
{
LONG parent = -1; /* reader number of the parent of the clone */
- LONG ret;
DWORD valueLength;
int currentDigit = -1;
int supportedChannels = 0;
@@ -540,6 +528,7 @@
if (strcmp((sReadersContexts[i])->lpcLibrary, libraryName) == 0)
{
UCHAR tagValue[1];
+ LONG ret;
/*
* Ask the driver if it supports multiple channels
@@ -628,20 +617,15 @@
LPTSTR lpcTReaders;
int i, p;
- /*
- * Zero out everything
- */
- dwCSize = 0;
- lpcTReaders = 0;
- i = 0;
- p = 0;
-
if (dwNumReadersContexts == 0)
return SCARD_E_READER_UNAVAILABLE;
/*
* Ignore the groups for now, return all readers
*/
+ dwCSize = 0;
+ p = 0;
+
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
if ((sReadersContexts[i])->vHandle != 0)
@@ -707,11 +691,6 @@
{
int i;
- /*
- * Zero out everything
- */
- i = 0;
-
if (lpcReader == 0)
return SCARD_E_UNKNOWN_READER;
@@ -734,18 +713,14 @@
PREADER_CONTEXT * sReader)
{
char lpcStripReader[MAX_READERNAME];
- int i, tmplen;
-
- /*
- * Zero out everything
- */
- i = 0;
- tmplen = 0;
+ int i;
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
if ((sReadersContexts[i])->vHandle != 0)
{
+ int tmplen;
+
strncpy(lpcStripReader, (sReadersContexts[i])->lpcReader,
sizeof(lpcStripReader));
tmplen = strlen(lpcStripReader);
@@ -768,14 +743,8 @@
int i;
/*
- * Zero out everything
- */
- i = 0;
-
- /*
* Strip off the lower nibble and get the identity
*/
-
dwIdentity = dwIdentity >> (sizeof(DWORD) / 2) * 8;
dwIdentity = dwIdentity << (sizeof(DWORD) / 2) * 8;
@@ -793,10 +762,6 @@
LONG RFLoadReader(PREADER_CONTEXT rContext)
{
- LONG rv;
-
- rv = 0;
-
if (rContext->vHandle != 0)
{
DebugLogA("Warning library pointer not NULL");
@@ -806,23 +771,12 @@
return SCARD_S_SUCCESS;
}
- if (rContext->vHandle == 0)
- rv = DYN_LoadLibrary(&rContext->vHandle, rContext->lpcLibrary);
-
- return rv;
+ return DYN_LoadLibrary(&rContext->vHandle, rContext->lpcLibrary);
}
LONG RFBindFunctions(PREADER_CONTEXT rContext)
{
- LONG rv, rv1, rv2, rv3;
-
- /*
- * Zero out everything
- */
- rv = 0;
- rv1 = 0;
- rv2 = 0;
- rv3 = 0;
+ int rv1, rv2, rv3;
/*
* Use this function as a dummy to determine the IFD Handler version
@@ -885,6 +839,8 @@
if (rContext->dwVersion == IFD_HVERSION_1_0)
{
+ int rv;
+
DebugLogA("Loading IFD Handler 1.0");
rv = DYN_GetAddress(rContext->vHandle,
@@ -1002,6 +958,8 @@
*/
} else if ((rContext->dwVersion == IFD_HVERSION_2_0) || (rContext->dwVersion == IFD_HVERSION_3_0))
{
+ int rv;
+
if (rContext->dwVersion == IFD_HVERSION_2_0)
DebugLogA("Loading IFD Handler 2.0");
else
@@ -1146,23 +1104,14 @@
LONG RFCheckSharing(DWORD hCard)
{
LONG rv;
- DWORD dwSharing;
- PREADER_CONTEXT rContext;
-
- /*
- * Zero out everything
- */
- dwSharing = 0;
- rContext = 0;
+ PREADER_CONTEXT rContext = NULL;
rv = RFReaderInfoById(hCard, &rContext);
if (rv != SCARD_S_SUCCESS)
return rv;
- dwSharing = hCard;
-
- if (rContext->dwLockId == 0 || rContext->dwLockId == dwSharing)
+ if (rContext->dwLockId == 0 || rContext->dwLockId == hCard)
return SCARD_S_SUCCESS;
else
return SCARD_E_SHARING_VIOLATION;
@@ -1171,12 +1120,7 @@
LONG RFLockSharing(DWORD hCard)
{
- PREADER_CONTEXT rContext;
-
- /*
- * Zero out everything
- */
- rContext = 0;
+ PREADER_CONTEXT rContext = NULL;
RFReaderInfoById(hCard, &rContext);
@@ -1193,12 +1137,7 @@
LONG RFUnlockSharing(DWORD hCard)
{
- PREADER_CONTEXT rContext;
-
- /*
- * Zero out everything
- */
- rContext = 0;
+ PREADER_CONTEXT rContext = NULL;
RFReaderInfoById(hCard, &rContext);
@@ -1217,11 +1156,6 @@
{
int i;
- /*
- * Zero out everything
- */
- i = 0;
-
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
(sReadersContexts[i])->dwBlockStatus = hContext;
@@ -1239,11 +1173,6 @@
LONG rv;
/*
- * Zero out everything
- */
- rv = 0;
-
- /*
* Spawn the event handler thread
*/
DebugLogB("Attempting startup of %s.", rContext->lpcReader);
@@ -1314,29 +1243,24 @@
SCARDHANDLE RFCreateReaderHandle(PREADER_CONTEXT rContext)
{
- int i, j;
USHORT randHandle;
/*
- * Zero out everything
- */
- randHandle = 0;
- i = 0;
- j = 0;
-
- /*
* Create a random handle with 16 bits check to see if it already is
* used.
*/
-
randHandle = SYS_Random(SYS_GetSeed(), 10, 65000);
while (1)
{
+ int i;
+
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
if ((sReadersContexts[i])->vHandle != 0)
{
+ int j;
+
for (j = 0; j < PCSCLITE_MAX_READER_CONTEXT_CHANNELS; j++)
{
if ((rContext->dwIdentity + randHandle) ==
@@ -1366,15 +1290,14 @@
LONG RFFindReaderHandle(SCARDHANDLE hCard)
{
- int i, j;
-
- i = 0;
- j = 0;
+ int i;
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
if ((sReadersContexts[i])->vHandle != 0)
{
+ int j;
+
for (j = 0; j < PCSCLITE_MAX_READER_CONTEXT_CHANNELS; j++)
{
if (hCard == (sReadersContexts[i])->psHandles[j].hCard)
@@ -1394,7 +1317,6 @@
LONG RFAddReaderHandle(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
{
int i;
- i = 0;
for (i = 0; i < PCSCLITE_MAX_READER_CONTEXT_CHANNELS; i++)
{
@@ -1416,7 +1338,6 @@
LONG RFRemoveReaderHandle(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
{
int i;
- i = 0;
for (i = 0; i < PCSCLITE_MAX_READER_CONTEXT_CHANNELS; i++)
{
@@ -1438,7 +1359,6 @@
LONG RFSetReaderEventState(PREADER_CONTEXT rContext, DWORD dwEvent)
{
int i;
- i = 0;
/*
* Set all the handles for that reader to the event
@@ -1455,7 +1375,6 @@
LONG RFCheckReaderEventState(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
{
int i;
- i = 0;
for (i = 0; i < PCSCLITE_MAX_READER_CONTEXT_CHANNELS; i++)
{
@@ -1484,7 +1403,6 @@
LONG RFClearReaderEventState(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
{
int i;
- i = 0;
for (i = 0; i < PCSCLITE_MAX_READER_CONTEXT_CHANNELS; i++)
{
@@ -1511,14 +1429,15 @@
void RFCleanupReaders(int shouldExit)
{
int i;
- LONG rv;
- char lpcStripReader[MAX_READERNAME];
DebugLogA("entering cleaning function");
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
if (sReadersContexts[i]->vHandle != 0)
{
+ LONG rv;
+ char lpcStripReader[MAX_READERNAME];
+
DebugLogB("Stopping reader: %s", sReadersContexts[i]->lpcReader);
strncpy(lpcStripReader, (sReadersContexts[i])->lpcReader,
@@ -1562,7 +1481,7 @@
void RFAwakeAllReaders(void)
{
LONG rv = IFD_SUCCESS;
- int i, j;
+ int i;
int initFlag;
initFlag = 0;
@@ -1573,11 +1492,12 @@
if ( ((sReadersContexts[i])->vHandle != 0) &&
((sReadersContexts[i])->pthThread == 0) )
{
+ int j;
for (j=0; j < i; j++)
{
if (((sReadersContexts[j])->vHandle == (sReadersContexts[i])->vHandle)&&
- ((sReadersContexts[j])->dwPort == (sReadersContexts[i])->dwPort))
+ ((sReadersContexts[j])->dwPort == (sReadersContexts[i])->dwPort))
{
initFlag = 1;
}
@@ -1591,7 +1511,7 @@
if (rv != IFD_SUCCESS)
{
DebugLogC("Open Port %X Failed (%s)",
- (sReadersContexts[i])->dwPort, (sReadersContexts[i])->lpcDevice);
+ (sReadersContexts[i])->dwPort, (sReadersContexts[i])->lpcDevice);
}
Index: winscard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- winscard.c 18 Jun 2004 14:48:58 -0000 1.34
+++ winscard.c 21 Jun 2004 07:40:26 -0000 1.35
@@ -43,13 +43,6 @@
LONG SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1,
LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
{
- LONG rv;
-
- /*
- * Zero out everything
- */
- rv = 0;
-
/*
* Check for NULL pointer
*/
@@ -551,18 +544,7 @@
LONG SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition)
{
LONG rv;
- UCHAR controlBuffer[5];
- UCHAR receiveBuffer[MAX_BUFFER_SIZE];
- PREADER_CONTEXT rContext;
- DWORD dwAtrLen, receiveLength;
-
- /*
- * Zero out everything
- */
- rv = 0;
- rContext = 0;
- dwAtrLen = 0;
- receiveLength = 0;
+ PREADER_CONTEXT rContext = NULL;
if (hCard == 0)
return SCARD_E_INVALID_HANDLE;
@@ -651,6 +633,10 @@
}
else if (dwDisposition == SCARD_EJECT_CARD)
{
+ UCHAR controlBuffer[5];
+ UCHAR receiveBuffer[MAX_BUFFER_SIZE];
+ DWORD receiveLength;
+
/*
* Set up the CTBCS command for Eject ICC
*/
@@ -722,11 +708,6 @@
LONG rv;
PREADER_CONTEXT rContext;
- /*
- * Zero out everything
- */
- rv = 0;
-
if (hCard == 0)
return SCARD_E_INVALID_HANDLE;
@@ -765,17 +746,7 @@
LONG SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition)
{
LONG rv;
- PREADER_CONTEXT rContext;
- UCHAR controlBuffer[5];
- UCHAR receiveBuffer[MAX_BUFFER_SIZE];
- DWORD receiveLength;
-
- /*
- * Zero out everything
- */
- rContext = 0;
- rv = 0;
- receiveLength = 0;
+ PREADER_CONTEXT rContext = NULL;
/*
* Ignoring dwDisposition for now
@@ -869,6 +840,10 @@
}
else if (dwDisposition == SCARD_EJECT_CARD)
{
+ UCHAR controlBuffer[5];
+ UCHAR receiveBuffer[MAX_BUFFER_SIZE];
+ DWORD receiveLength;
+
/*
* Set up the CTBCS command for Eject ICC
*/
@@ -917,13 +892,7 @@
LONG SCardCancelTransaction(SCARDHANDLE hCard)
{
LONG rv;
- PREADER_CONTEXT rContext;
-
- /*
- * Zero out everything
- */
- rContext = 0;
- rv = 0;
+ PREADER_CONTEXT rContext = NULL;
/*
* Ignoring dwDisposition for now
@@ -961,13 +930,7 @@
LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen)
{
LONG rv;
- PREADER_CONTEXT rContext;
-
- /*
- * Zero out everything
- */
- rContext = 0;
- rv = 0;
+ PREADER_CONTEXT rContext = NULL;
rv = RFReaderInfoById(hCard, &rContext);
@@ -1089,13 +1052,7 @@
LPVOID pbRecvBuffer, DWORD cbRecvLength, LPDWORD lpBytesReturned)
{
LONG rv;
- PREADER_CONTEXT rContext;
-
- /*
- * Zero out everything
- */
- rv = 0;
- rContext = 0;
+ PREADER_CONTEXT rContext = NULL;
/* 0 bytes returned by default */
*lpBytesReturned = 0;
@@ -1144,13 +1101,7 @@
LPBYTE pbAttr, LPDWORD pcbAttrLen)
{
LONG rv;
- PREADER_CONTEXT rContext;
-
- /*
- * Zero out everything
- */
- rv = 0;
- rContext = 0;
+ PREADER_CONTEXT rContext = NULL;
if (0 == hCard)
return SCARD_E_INVALID_HANDLE;
@@ -1193,13 +1144,7 @@
LPCBYTE pbAttr, DWORD cbAttrLen)
{
LONG rv;
- PREADER_CONTEXT rContext;
-
- /*
- * Zero out everything
- */
- rv = 0;
- rContext = 0;
+ PREADER_CONTEXT rContext = NULL;
if (0 == hCard)
return SCARD_E_INVALID_HANDLE;
@@ -1244,17 +1189,9 @@
LPDWORD pcbRecvLength)
{
LONG rv;
- PREADER_CONTEXT rContext;
+ PREADER_CONTEXT rContext = NULL;
SCARD_IO_HEADER sSendPci, sRecvPci;
DWORD dwRxLength, tempRxLength;
-
- /*
- * Zero out everything
- */
- rv = 0;
- rContext = 0;
- dwRxLength = 0;
- tempRxLength = 0;
if (pcbRecvLength == 0)
return SCARD_E_INVALID_PARAMETER;
Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- winscard_clnt.c 17 Jun 2004 07:44:03 -0000 1.38
+++ winscard_clnt.c 21 Jun 2004 07:40:26 -0000 1.39
@@ -113,19 +113,11 @@
LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
{
LONG rv;
- int i, j, pageSize;
+ int i;
establish_struct scEstablishStruct;
sharedSegmentMsg msgStruct;
DWORD dwClientID = 0;
- /*
- * Zero out everything
- */
- rv = 0;
- i = 0;
- j = 0;
- pageSize = 0;
-
if (phContext == NULL)
return SCARD_E_INVALID_PARAMETER;
else
@@ -139,6 +131,8 @@
*/
if (isExecuted == 0)
{
+ int pageSize;
+
/*
* Initialize debug
*/
@@ -181,6 +175,8 @@
for (i = 0; i < PCSCLITE_MAX_APPLICATION_CONTEXTS; i++)
{
+ int j;
+
/*
* Initially set the context struct to zero
*/
@@ -305,11 +301,6 @@
DWORD dwContextIndex;
PCSCLITE_THREAD_T currentTID;
- /*
- * Zero out everything
- */
- rv = 0;
-
if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
return SCARD_E_NO_SERVICE;
@@ -390,11 +381,6 @@
DWORD dwContextIndex;
/*
- * Zero out everything
- */
- rv = 0;
-
- /*
* Check for NULL parameters
*/
if (phCard == 0 || pdwActiveProtocol == 0)
@@ -489,12 +475,6 @@
int i;
DWORD dwContextIndex, dwChannelIndex;
- /*
- * Zero out everything
- */
- i = 0;
- rv = 0;
-
if (dwInitialization != SCARD_LEAVE_CARD &&
dwInitialization != SCARD_RESET_CARD &&
dwInitialization != SCARD_UNPOWER_CARD &&
@@ -586,11 +566,6 @@
sharedSegmentMsg msgStruct;
DWORD dwContextIndex, dwChannelIndex;
- /*
- * Zero out everything
- */
- rv = 0;
-
if (dwDisposition != SCARD_LEAVE_CARD &&
dwDisposition != SCARD_RESET_CARD &&
dwDisposition != SCARD_UNPOWER_CARD &&
@@ -651,18 +626,10 @@
LONG rv;
begin_struct scBeginStruct;
- int timeval, randnum, i, j;
+ int i;
sharedSegmentMsg msgStruct;
DWORD dwContextIndex, dwChannelIndex;
- /*
- * Zero out everything
- */
- timeval = 0;
- randnum = 0;
- i = 0;
- rv = 0;
-
if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
return SCARD_E_NO_SERVICE;
@@ -706,6 +673,9 @@
*/
if ((readerStates[i])->lockState != 0)
{
+ int randnum = 0;
+ int j;
+
for (j = 0; j < 100; j++)
{
/*
@@ -766,8 +736,6 @@
* Zero out everything
*/
randnum = 0;
- i = 0;
- rv = 0;
if (dwDisposition != SCARD_LEAVE_CARD &&
dwDisposition != SCARD_RESET_CARD &&
@@ -850,12 +818,6 @@
int i;
DWORD dwContextIndex, dwChannelIndex;
- /*
- * Zero out everything
- */
- i = 0;
- rv = 0;
-
if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
return SCARD_E_NO_SERVICE;
@@ -926,12 +888,6 @@
DWORD dwContextIndex, dwChannelIndex;
/*
- * Zero out everything
- */
- rv = 0;
- i = 0;
-
- /*
* Check for NULL parameters
*/
@@ -1065,30 +1021,14 @@
LONG SCardGetStatusChange(SCARDCONTEXT hContext, DWORD dwTimeout,
LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders)
{
- LONG rv;
PSCARD_READERSTATE_A currReader;
PREADER_STATE rContext;
- LPTSTR lpcReaderName;
- DWORD dwTime;
+ DWORD dwTime = 0;
DWORD dwState;
- DWORD dwBreakFlag;
- int i, j;
+ DWORD dwBreakFlag = 0;
+ int j;
DWORD dwContextIndex;
- /*
- * Zero out everything
- */
- rv = 0;
- rContext = 0;
- lpcReaderName = 0;
- dwTime = 0;
- j = 0;
- dwState = 0;
- i = 0;
- currReader = 0;
- dwContextIndex = 0;
- dwBreakFlag = 0;
-
if (rgReaderStates == 0 && cReaders > 0)
return SCARD_E_INVALID_PARAMETER;
@@ -1117,6 +1057,8 @@
{
while (1)
{
+ int i;
+
if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
{
SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
@@ -1222,6 +1164,8 @@
currReader->dwEventState = SCARD_STATE_IGNORE;
} else
{
+ LPTSTR lpcReaderName;
+ int i;
/************ Looks for correct readernames *********************/
@@ -1537,12 +1481,6 @@
int i;
DWORD dwContextIndex, dwChannelIndex;
- /*
- * Zero out everything
- */
- rv = 0;
- i = 0;
-
/* 0 bytes received by default */
if (NULL != lpBytesReturned)
*lpBytesReturned = 0;
@@ -1654,12 +1592,6 @@
int i;
DWORD dwContextIndex, dwChannelIndex;
- /*
- * Zero out everything
- */
- rv = 0;
- i = 0;
-
if (NULL == pbAttr || 0 == *pcbAttrLen)
return SCARD_E_INVALID_PARAMETER;
@@ -1759,12 +1691,6 @@
int i;
DWORD dwContextIndex, dwChannelIndex;
- /*
- * Zero out everything
- */
- rv = 0;
- i = 0;
-
if (pbSendBuffer == 0 || pbRecvBuffer == 0 ||
pcbRecvLength == 0 || pioSendPci == 0)
return SCARD_E_INVALID_PARAMETER;
@@ -1881,19 +1807,11 @@
LONG SCardListReaders(SCARDCONTEXT hContext, LPCTSTR mszGroups,
LPTSTR mszReaders, LPDWORD pcchReaders)
{
- DWORD dwGroupsLen, dwReadersLen;
- int i, lastChrPtr;
+ DWORD dwReadersLen = 0;
+ int i, lastChrPtr = 0;
DWORD dwContextIndex;
/*
- * Zero out everything
- */
- dwGroupsLen = 0;
- dwReadersLen = 0;
- i = 0;
- lastChrPtr = 0;
-
- /*
* Check for NULL parameters
*/
if (pcchReaders == 0)
@@ -2064,7 +1982,6 @@
static LONG SCardGetContextIndiceTH(SCARDCONTEXT hContext)
{
int i;
- i = 0;
/*
* Find this context and return it's spot in the array
@@ -2081,7 +1998,6 @@
static LONG SCardRemoveContext(SCARDCONTEXT hContext)
{
LONG retIndice;
- int i;
retIndice = SCardGetContextIndiceTH(hContext);
@@ -2089,6 +2005,8 @@
return SCARD_E_INVALID_HANDLE;
else
{
+ int i;
+
psContextMap[retIndice].hContext = 0;
SHMClientCloseSession(psContextMap[retIndice].dwClientID);
psContextMap[retIndice].dwClientID = 0;
@@ -2163,15 +2081,14 @@
static LONG SCardGetIndicesFromHandleTH(SCARDHANDLE hCard, PDWORD pdwContextIndice, PDWORD pdwChannelIndice)
{
- int i, j;
-
- i = 0;
- j = 0;
+ int i;
for (i = 0; i < PCSCLITE_MAX_APPLICATION_CONTEXTS; i++)
{
if (psContextMap[i].hContext != 0)
{
+ int j;
+
for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
{
if (psContextMap[i].psChannelMap[j].hCard == hCard)