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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jun 29 09:23:50 2012
New Revision: 6371

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6371
Log:
SCardDisconnect(): 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=6371&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Fri Jun 29 09:23:50 2012
@@ -835,12 +835,12 @@
 	{
 		if (rv != SCARD_E_SHARING_VIOLATION)
 		{
-			return rv;
+			goto exit;
 		}
 		else
 		{
 			if (SCARD_LEAVE_CARD != dwDisposition)
-				return rv;
+				goto exit;
 		}
 	}
 
@@ -1034,7 +1034,10 @@
 	 */
 	rContext->readerState->readerSharing = rContext->contexts;
 
-	return SCARD_S_SUCCESS;
+	rv = SCARD_S_SUCCESS;
+
+exit:
+	return rv;
 }
 
 LONG SCardBeginTransaction(SCARDHANDLE hCard)