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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Apr 28 09:28:05 2008
New Revision: 2915

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2915
Log:
return the returned value of SCardCheckDaemonAvailability() instead of
always SCARD_E_NO_SERVICE in case of error (may also be
SCARD_E_INVALID_HANDLE)

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=2915&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Mon Apr 28 09:28:05 2008
@@ -585,7 +585,8 @@
 	if (dwContextIndex == -1) 	 
 		return SCARD_E_INVALID_HANDLE;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
 	{
 		/*
 		 * Remove the local context from the stack
@@ -594,7 +595,7 @@
 		SCardRemoveContext(hContext);
 		SCardUnlockThread();
 
-		return SCARD_E_INVALID_HANDLE;
+		return rv;
 	}
 
 	SYS_MutexLock(psContextMap[dwContextIndex].mMutex);
@@ -750,8 +751,9 @@
 		return SCARD_E_INVALID_VALUE;
 	}
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this context has been opened
@@ -914,8 +916,9 @@
 	if (pdwActiveProtocol == NULL)
 		return SCARD_E_INVALID_PARAMETER;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -1034,8 +1037,9 @@
 		return SCARD_E_INVALID_VALUE;
 	}
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -1131,8 +1135,9 @@
 
 	PROFILE_START
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -1268,8 +1273,9 @@
 		return SCARD_E_INVALID_VALUE;
 	}
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -1354,8 +1360,9 @@
 
 	PROFILE_START
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -1510,8 +1517,9 @@
 	*pcchReaderLen = 0;
 	*pcbAtrLen = 0;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -1717,14 +1725,16 @@
 	int j;
 	LONG dwContextIndex;
 	int currentReaderCount = 0;
+	LONG rv;
 
 	PROFILE_START
 
 	if (rgReaderStates == NULL && cReaders > 0)
 		return SCARD_E_INVALID_PARAMETER;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this context has been opened
@@ -1747,10 +1757,11 @@
 		{
 			int i;
 
-			if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
+			rv = SCardCheckDaemonAvailability();
+			if (rv != SCARD_S_SUCCESS)
 			{
 				SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
-				return SCARD_E_NO_SERVICE;
+				return rv;
 			}
 
 			for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
@@ -1849,14 +1860,15 @@
 		int newReaderCount = 0;
 		char ReaderCountChanged = FALSE;
 
-		if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
+		rv = SCardCheckDaemonAvailability();
+		if (rv != SCARD_S_SUCCESS)
 		{
 			if (psContextMap[dwContextIndex].mMutex)
 				SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
 
-			PROFILE_END(SCARD_E_NO_SERVICE)
-
-			return SCARD_E_NO_SERVICE;
+			PROFILE_END(rv)
+
+			return rv;
 		}
 
 		if (j == 0)
@@ -2282,8 +2294,9 @@
 	if (NULL != lpBytesReturned)
 		*lpBytesReturned = 0;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -2617,8 +2630,9 @@
 	int i;
 	DWORD dwContextIndex, dwChannelIndex;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -2778,8 +2792,9 @@
 			pcbRecvLength == NULL || pioSendPci == NULL)
 		return SCARD_E_INVALID_PARAMETER;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this handle has been opened
@@ -3035,8 +3050,9 @@
 	if (pcchReaders == NULL)
 		return SCARD_E_INVALID_PARAMETER;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this context has been opened
@@ -3141,8 +3157,9 @@
 	const char ReaderGroup[] = "SCard$DefaultReaders";
 	const int dwGroups = strlen(ReaderGroup) + 2;
 
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_NO_SERVICE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this context has been opened
@@ -3257,8 +3274,9 @@
 	rv = SCARD_S_SUCCESS;
 
 	/* Check if the _same_ server is running */
-	if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-		return SCARD_E_INVALID_HANDLE;
+	rv = SCardCheckDaemonAvailability();
+	if (rv != SCARD_S_SUCCESS)
+		return rv;
 
 	/*
 	 * Make sure this context has been opened