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

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Fri Jun 29 09:24:47 UTC 2012


Author: rousseau
Date: Fri Jun 29 09:24:46 2012
New Revision: 6372

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6372
Log:
SCardBeginTransaction(): use an exit block

goto exit; instead of a direct return SCARD_E_*;

This will allow to factorize exit code.

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=6372&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Fri Jun 29 09:24:46 2012
@@ -1058,14 +1058,14 @@
 	 */
 	rv = RFCheckReaderStatus(rContext);
 	if (rv != SCARD_S_SUCCESS)
-		return rv;
+		goto exit;
 
 	/*
 	 * Make sure some event has not occurred
 	 */
 	rv = RFCheckReaderEventState(rContext, hCard);
 	if (rv != SCARD_S_SUCCESS)
-		return rv;
+		goto exit;
 
 	rv = RFLockSharing(hCard, rContext);
 
@@ -1076,6 +1076,7 @@
 
 	Log2(PCSC_LOG_DEBUG, "Status: 0x%08lX", rv);
 
+exit:
 	return rv;
 }
 




More information about the Pcsclite-cvs-commit mailing list