[Pcsclite-cvs-commit] r5213 - in /trunk/PCSC/src: eventhandler.c winscard.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Thu Sep 2 09:19:49 UTC 2010


Author: rousseau
Date: Thu Sep  2 09:19:46 2010
New Revision: 5213

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5213
Log:
Complete change started in revision 5212

rContext->readerState is never NULL now. So do not even check its value.

Modified:
    trunk/PCSC/src/eventhandler.c
    trunk/PCSC/src/winscard.c

Modified: trunk/PCSC/src/eventhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/eventhandler.c?rev=5213&op=diff
==============================================================================
--- trunk/PCSC/src/eventhandler.c (original)
+++ trunk/PCSC/src/eventhandler.c Thu Sep  2 09:19:46 2010
@@ -134,12 +134,6 @@
 	int rv;
 	DWORD dwGetSize;
 	UCHAR ucGetData[1];
-
-	if (NULL == rContext->readerState)
-	{
-		Log1(PCSC_LOG_ERROR, "Thread never started (reader init failed?)");
-		return SCARD_S_SUCCESS;
-	}
 
 	if ('\0' == rContext->readerState->readerName[0])
 	{

Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=5213&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Thu Sep  2 09:19:46 2010
@@ -319,10 +319,6 @@
 		Log1(PCSC_LOG_INFO, "Lock released");
 	}
 
-	/* the reader has been removed while we were waiting */
-	if (NULL == rContext->readerState)
-		return SCARD_E_NO_SMARTCARD;
-
 	/*******************************************
 	 *
 	 * This section tries to determine the
@@ -835,10 +831,6 @@
 			(void)SYS_USleep(PCSCLITE_LOCK_POLL_RATE);
 		Log1(PCSC_LOG_INFO, "Lock released");
 	}
-
-	/* the reader has been removed while we were waiting */
-	if (NULL == rContext->readerState)
-		return SCARD_E_NO_SMARTCARD;
 
 	/*
 	 * Unlock any blocks on this context




More information about the Pcsclite-cvs-commit mailing list