[Pcsclite-cvs-commit] r2544 - trunk/PCSC/src
rousseau at alioth.debian.org
rousseau at alioth.debian.org
Wed May 23 14:19:45 UTC 2007
Author: rousseau
Date: 2007-05-23 14:19:45 +0000 (Wed, 23 May 2007)
New Revision: 2544
Modified:
trunk/PCSC/src/eventhandler.c
trunk/PCSC/src/eventhandler.h
trunk/PCSC/src/readerfactory.c
Log:
lockState field of READER_STATE was not used. Remove it and the
associated dead code
Modified: trunk/PCSC/src/eventhandler.c
===================================================================
--- trunk/PCSC/src/eventhandler.c 2007-05-23 14:03:46 UTC (rev 2543)
+++ trunk/PCSC/src/eventhandler.c 2007-05-23 14:19:45 UTC (rev 2544)
@@ -90,7 +90,6 @@
memset((readerStates[i])->cardAtr, 0, MAX_ATR_SIZE);
(readerStates[i])->readerID = 0;
(readerStates[i])->readerState = 0;
- (readerStates[i])->lockState = 0;
(readerStates[i])->readerSharing = 0;
(readerStates[i])->cardAtrLength = 0;
(readerStates[i])->cardProtocol = SCARD_PROTOCOL_UNSET;
@@ -139,7 +138,6 @@
sizeof(rContext->readerState->cardAtr));
rContext->readerState->readerID = 0;
rContext->readerState->readerState = 0;
- rContext->readerState->lockState = 0;
rContext->readerState->readerSharing = 0;
rContext->readerState->cardAtrLength = 0;
rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
@@ -473,7 +471,3 @@
}
}
-void EHSetSharingEvent(PREADER_CONTEXT rContext, DWORD dwValue)
-{
- rContext->readerState->lockState = dwValue;
-}
Modified: trunk/PCSC/src/eventhandler.h
===================================================================
--- trunk/PCSC/src/eventhandler.h 2007-05-23 14:03:46 UTC (rev 2543)
+++ trunk/PCSC/src/eventhandler.h 2007-05-23 14:19:45 UTC (rev 2544)
@@ -33,7 +33,7 @@
char readerName[MAX_READERNAME];
DWORD readerState;
LONG readerSharing;
- DWORD lockState;
+ DWORD dummy;
UCHAR cardAtr[MAX_ATR_SIZE];
DWORD cardAtrLength;
@@ -44,7 +44,6 @@
LONG EHInitializeEventStructures(void);
LONG EHSpawnEventHandler(PREADER_CONTEXT);
LONG EHDestroyEventHandler(PREADER_CONTEXT);
- void EHSetSharingEvent(PREADER_CONTEXT, DWORD);
#ifdef __cplusplus
}
Modified: trunk/PCSC/src/readerfactory.c
===================================================================
--- trunk/PCSC/src/readerfactory.c 2007-05-23 14:03:46 UTC (rev 2543)
+++ trunk/PCSC/src/readerfactory.c 2007-05-23 14:19:45 UTC (rev 2544)
@@ -1056,7 +1056,6 @@
if (RFCheckSharing(hCard) == SCARD_S_SUCCESS)
{
- EHSetSharingEvent(rContext, 1);
rContext->LockCount += 1;
rContext->dwLockId = hCard;
}
@@ -1079,7 +1078,6 @@
if (rv != SCARD_S_SUCCESS)
return rv;
- EHSetSharingEvent(rContext, 0);
if (rContext->LockCount > 0)
rContext->LockCount -= 1;
if (0 == rContext->LockCount)
More information about the Pcsclite-cvs-commit
mailing list