[Pcsclite-cvs-commit] r3047 - /trunk/PCSC/src/winscard_clnt.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Fri Jul 4 09:51:31 UTC 2008
Author: rousseau
Date: Fri Jul 4 09:51:31 2008
New Revision: 3047
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3047
Log:
SCardGetStatusChange(): simplify bad state check
Modified:
trunk/PCSC/src/winscard_clnt.c
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=3047&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Jul 4 09:51:31 2008
@@ -1972,31 +1972,21 @@
/*********** Check if the reader is in the correct state ********/
if (dwState & SCARD_UNKNOWN)
{
- /*
- * App thinks reader is in bad state and it is
- */
- if (currReader-> dwCurrentState & SCARD_STATE_UNAVAILABLE)
- currReader->dwEventState = SCARD_STATE_UNAVAILABLE;
- else
+ /* reader is in bad state */
+ currReader->dwEventState = SCARD_STATE_UNAVAILABLE;
+ if (!(currReader->dwCurrentState & SCARD_STATE_UNAVAILABLE))
{
- /*
- * App thinks reader is in good state and it is
- * not
- */
- currReader->dwEventState = SCARD_STATE_CHANGED |
- SCARD_STATE_UNAVAILABLE;
+ /* App thinks reader is in good state and it is not */
+ currReader->dwEventState = SCARD_STATE_CHANGED;
dwBreakFlag = 1;
}
}
else
{
- /*
- * App thinks reader in bad state but it is not
- */
+ /* App thinks reader in bad state but it is not */
if (currReader-> dwCurrentState & SCARD_STATE_UNAVAILABLE)
{
- currReader->dwEventState &=
- ~SCARD_STATE_UNAVAILABLE;
+ currReader->dwEventState &= ~SCARD_STATE_UNAVAILABLE;
currReader->dwEventState |= SCARD_STATE_CHANGED;
dwBreakFlag = 1;
}
More information about the Pcsclite-cvs-commit
mailing list