[Pcsclite-cvs-commit] r5549 - /trunk/PCSC/src/winscard_clnt.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jan 25 15:45:50 2011
New Revision: 5549

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5549
Log:
SCardCancel(): Always exit from the same point so that profiling
does work even in case of error

Modified:
    trunk/PCSC/src/winscard_clnt.c

Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=5549&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Tue Jan 25 15:45:50 2011
@@ -3226,10 +3226,16 @@
 	 */
 	currentContextMap = SCardGetContext(hContext);
 	if (NULL == currentContextMap)
-		return SCARD_E_INVALID_HANDLE;
+	{
+		rv = SCARD_E_INVALID_HANDLE;
+		goto error;
+	}
 
 	if (! currentContextMap->cancellable)
-		return SCARD_S_SUCCESS;
+	{
+		rv = SCARD_S_SUCCESS;
+		goto error;
+	}
 
 	/* create a new connection to the server */
 	if (ClientSetupSession(&dwClientID) != 0)