[Pcsclite-cvs-commit] r6317 - /trunk/PCSC/src/winscard.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jun  5 08:25:50 2012
New Revision: 6317

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6317
Log:
Calls to RFFindReaderHandle() are now useless

RFFindReaderHandle() was used to check the hCard is valid.
Since revision 6316 the algorithm used in RFFindReaderHandle() is
already used in RFReaderInfoById().

So calling RFFindReaderHandle() after RFReaderInfoById() (as it was done)
is now useless.

Modified:
    trunk/PCSC/src/winscard.c

Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=6317&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Tue Jun  5 08:25:50 2012
@@ -528,10 +528,6 @@
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
-	rv = RFFindReaderHandle(hCard);
-	if (rv != SCARD_S_SUCCESS)
-		return rv;
-
 	/*
 	 * Make sure no one has a lock on this reader
 	 */
@@ -771,10 +767,6 @@
 
 	/* get rContext corresponding to hCard */
 	rv = RFReaderInfoById(hCard, &rContext);
-	if (rv != SCARD_S_SUCCESS)
-		return rv;
-
-	rv = RFFindReaderHandle(hCard);
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
@@ -1030,10 +1022,6 @@
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
-	rv = RFFindReaderHandle(hCard);
-	if (rv != SCARD_S_SUCCESS)
-		return rv;
-
 	/*
 	 * Make sure some event has not occurred
 	 */
@@ -1072,10 +1060,6 @@
 
 	/* get rContext corresponding to hCard */
 	rv = RFReaderInfoById(hCard, &rContext);
-	if (rv != SCARD_S_SUCCESS)
-		return rv;
-
-	rv = RFFindReaderHandle(hCard);
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
@@ -1283,10 +1267,6 @@
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
-	rv = RFFindReaderHandle(hCard);
-	if (rv != SCARD_S_SUCCESS)
-		return rv;
-
 	if (IFD_HVERSION_2_0 == rContext->version)
 	{
 		/* we must wrap a API 3.0 client in an API 2.0 driver */
@@ -1327,10 +1307,6 @@
 	 * Make sure the reader is working properly
 	 */
 	rv = RFCheckReaderStatus(rContext);
-	if (rv != SCARD_S_SUCCESS)
-		return rv;
-
-	rv = RFFindReaderHandle(hCard);
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
@@ -1407,10 +1383,6 @@
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
-	rv = RFFindReaderHandle(hCard);
-	if (rv != SCARD_S_SUCCESS)
-		return rv;
-
 	/*
 	 * Make sure some event has not occurred
 	 */
@@ -1469,10 +1441,6 @@
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
-	rv = RFFindReaderHandle(hCard);
-	if (rv != SCARD_S_SUCCESS)
-		return rv;
-
 	/*
 	 * Make sure some event has not occurred
 	 */