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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Feb  9 14:15:02 2010
New Revision: 4733

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4733
Log:
do not use the uint32_t rv structure field but copy it into rv first to
avoid a compiler warning

winscard_clnt.c: In function ?SCardReconnect?:
winscard_clnt.c:1035: warning: comparison between signed and unsigned
winscard_clnt.c: In function ?SCardBeginTransaction?:
winscard_clnt.c:1254: warning: comparison between signed and unsigned
winscard_clnt.c: In function ?SCardStatus?:
winscard_clnt.c:1657: warning: comparison between signed and unsigned
winscard_clnt.c: In function ?SCardTransmit?:
winscard_clnt.c:2939: warning: comparison between signed and unsigned

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=4733&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Tue Feb  9 14:15:02 2010
@@ -1031,15 +1031,15 @@
 		goto end;
 	}
 
-	if (sharing_shall_block
-		&& (SCARD_E_SHARING_VIOLATION == scReconnectStruct.rv))
+	rv = scReconnectStruct.rv;
+
+	if (sharing_shall_block && (SCARD_E_SHARING_VIOLATION == rv))
 	{
 		(void)SYS_USleep(PCSCLITE_LOCK_POLL_RATE);
 		goto retry;
 	}
 	
 	*pdwActiveProtocol = scReconnectStruct.dwActiveProtocol;
-	rv = scReconnectStruct.rv;
 
 end:
 	(void)SYS_MutexUnLock(currentContextMap->mMutex);
@@ -1250,9 +1250,9 @@
 			goto end;
 		}
 
-	}
-	while (scBeginStruct.rv == SCARD_E_SHARING_VIOLATION);
-	rv = scBeginStruct.rv;
+		rv = scBeginStruct.rv;
+	}
+	while (SCARD_E_SHARING_VIOLATION == rv);
 
 end:
 	(void)SYS_MutexUnLock(currentContextMap->mMutex);
@@ -1653,14 +1653,14 @@
 		goto end;
 	}
 
-	if (sharing_shall_block
-		&& (SCARD_E_SHARING_VIOLATION == scStatusStruct.rv))
+	rv = scStatusStruct.rv;
+
+	if (sharing_shall_block && (SCARD_E_SHARING_VIOLATION == rv))
 	{
 		(void)SYS_USleep(PCSCLITE_LOCK_POLL_RATE);
 		goto retry;
 	}
 	
-	rv = scStatusStruct.rv;
 	if (rv != SCARD_S_SUCCESS && rv != SCARD_E_INSUFFICIENT_BUFFER)
 	{
 		/*
@@ -2935,16 +2935,16 @@
 			pioRecvPci->cbPciLength = scTransmitStruct.ioRecvPciLength;
 		}
 	}
-	if (sharing_shall_block
-		&& (SCARD_E_SHARING_VIOLATION == scTransmitStruct.rv))
+
+	rv = scTransmitStruct.rv;
+
+	if (sharing_shall_block && (SCARD_E_SHARING_VIOLATION == rv))
 	{
 		(void)SYS_USleep(PCSCLITE_LOCK_POLL_RATE);
 		goto retry;
 	}
-	
 
 	*pcbRecvLength = scTransmitStruct.pcbRecvLength;
-	rv = scTransmitStruct.rv;
 
 end:
 	(void)SYS_MutexUnLock(currentContextMap->mMutex);