[Pcsclite-cvs-commit] r1816 - trunk/PCSC/src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-01-18 21:30:18 +0000 (Wed, 18 Jan 2006)
New Revision: 1816

Modified:
   trunk/PCSC/src/winscard_clnt.c
Log:
SCardTransmit(): code simplification


Modified: trunk/PCSC/src/winscard_clnt.c
===================================================================
--- trunk/PCSC/src/winscard_clnt.c	2006-01-18 13:44:24 UTC (rev 1815)
+++ trunk/PCSC/src/winscard_clnt.c	2006-01-18 21:30:18 UTC (rev 1816)
@@ -2528,8 +2528,6 @@
 
 	if (scTransmitStruct.rv == SCARD_S_SUCCESS)
 	{
-		*pcbRecvLength = scTransmitStruct.pcbRecvLength;
-
 		/*
 		 * Copy and zero it so any secret information is not leaked
 		 */
@@ -2539,20 +2537,14 @@
 			scTransmitStruct.pcbRecvLength);
 
 		if (pioRecvPci)
-		{
 			memcpy(pioRecvPci, &scTransmitStruct.pioRecvPci,
 				sizeof(SCARD_IO_REQUEST));
-		}
-
-		SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);	
-		
-		return scTransmitStruct.rv;
-	} else
-	{
-		*pcbRecvLength = scTransmitStruct.pcbRecvLength;
-		SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);	
-		return scTransmitStruct.rv;
 	}
+
+	*pcbRecvLength = scTransmitStruct.pcbRecvLength;
+	SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);	
+
+	return scTransmitStruct.rv;
 }
 
 /**