[Pcsclite-cvs-commit] r3049 - /trunk/PCSC/src/winscard_clnt.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jul  4 12:46:42 2008
New Revision: 3049

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3049
Log:
SCardGetStatusChange(): simplify SCARD_SWALLOWED 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=3049&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Jul  4 12:46:42 2008
@@ -2027,14 +2027,10 @@
 
 					if (dwState & SCARD_SWALLOWED)
 					{
-						if (currReader->dwCurrentState & SCARD_STATE_MUTE)
-							currReader->dwEventState |= SCARD_STATE_MUTE;
-						else
+						currReader->dwEventState |= SCARD_STATE_MUTE;
+						if (!(currReader->dwCurrentState & SCARD_STATE_MUTE))
 						{
-							currReader->dwEventState |= SCARD_STATE_MUTE;
-							if (currReader->dwCurrentState
-								!= SCARD_STATE_UNAWARE)
-								currReader->dwEventState |= SCARD_STATE_CHANGED;
+							currReader->dwEventState |= SCARD_STATE_CHANGED;
 							dwBreakFlag = 1;
 						}
 					}
@@ -2043,8 +2039,7 @@
 						/* App thinks card is mute but it is not */
 						if (currReader->dwCurrentState & SCARD_STATE_MUTE)
 						{
-							currReader->dwEventState |=
-								SCARD_STATE_CHANGED;
+							currReader->dwEventState |= SCARD_STATE_CHANGED;
 							dwBreakFlag = 1;
 						}
 					}