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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Nov  2 12:52:20 2009
New Revision: 4528

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4528
Log:
SCardConnect(), SCardDisconnect() & SCardReleaseContext(): correctly
handle error cases profiling

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=4528&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Mon Nov  2 12:52:20 2009
@@ -603,7 +603,7 @@
 	(void)SCardRemoveContext(hContext);
 	(void)SCardUnlockThread();
 
-	PROFILE_END(scReleaseStruct.rv)
+	PROFILE_END(rv)
 
 	return rv;
 }
@@ -781,7 +781,7 @@
 end:
 	(void)SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
 
-	PROFILE_END(scConnectStruct.rv)
+	PROFILE_END(rv)
 
 	return rv;
 }
@@ -1017,13 +1017,14 @@
 	}
 
 	(void)SCardRemoveHandle(hCard);
+	rv = scDisconnectStruct.rv;
 
 end:
 	(void)SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
 
-	PROFILE_END(scDisconnectStruct.rv)
-
-	return scDisconnectStruct.rv;
+	PROFILE_END(rv)
+
+	return rv;
 }
 
 /**