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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jun 29 09:54:45 2012
New Revision: 6376

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

goto exit; instead of a direct return.

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=6376&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Fri Jun 29 09:54:45 2012
@@ -1351,21 +1351,21 @@
 	 */
 	rv = RFCheckSharing(hCard, rContext);
 	if (rv != SCARD_S_SUCCESS)
-		return rv;
+		goto exit;
 
 	/*
 	 * Make sure the reader is working properly
 	 */
 	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 = IFDGetCapabilities(rContext, dwAttrId, pcbAttrLen, pbAttr);
 	switch(rv)
@@ -1402,6 +1402,7 @@
 			rv = SCARD_E_NOT_TRANSACTED;
 	}
 
+exit:
 	return rv;
 }