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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu May 15 12:50:20 2008
New Revision: 2956

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2956
Log:
SCardEstablishContextTH(), SCardConnect(), SCardReconnect(),
SCardDisconnect(), SCardEndTransaction(): do not check parameters for
SCARD_E_INVALID_VALUE since these tests are also done on the server
side.
Do not duplicate code

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=2956&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Thu May 15 12:50:20 2008
@@ -502,12 +502,6 @@
 		isExecuted = 1;
 	}
 
-
-	if (dwScope != SCARD_SCOPE_USER && dwScope != SCARD_SCOPE_TERMINAL &&
-		dwScope != SCARD_SCOPE_SYSTEM && dwScope != SCARD_SCOPE_GLOBAL)
-	{
-		return SCARD_E_INVALID_VALUE;
-	}
 
 	/*
 	 * Try to establish an Application Context with the server
@@ -743,14 +737,6 @@
 	if (strlen(szReader) > MAX_READERNAME)
 		return SCARD_E_INVALID_VALUE;
 
-	if (!(dwPreferredProtocols & SCARD_PROTOCOL_T0) &&
-		!(dwPreferredProtocols & SCARD_PROTOCOL_T1) &&
-		!(dwPreferredProtocols & SCARD_PROTOCOL_RAW) &&
-		!(dwPreferredProtocols & SCARD_PROTOCOL_ANY_OLD))
-	{
-		return SCARD_E_INVALID_VALUE;
-	}
-
 	rv = SCardCheckDaemonAvailability();
 	if (rv != SCARD_S_SUCCESS)
 		return rv;
@@ -897,22 +883,6 @@
 
 	PROFILE_START
 
-	if (dwInitialization != SCARD_LEAVE_CARD &&
-		dwInitialization != SCARD_RESET_CARD &&
-		dwInitialization != SCARD_UNPOWER_CARD &&
-		dwInitialization != SCARD_EJECT_CARD)
-	{
-		return SCARD_E_INVALID_VALUE;
-	}
-
-	if (!(dwPreferredProtocols & SCARD_PROTOCOL_T0) &&
-		!(dwPreferredProtocols & SCARD_PROTOCOL_T1) &&
-		!(dwPreferredProtocols & SCARD_PROTOCOL_RAW) &&
-		!(dwPreferredProtocols & SCARD_PROTOCOL_ANY_OLD))
-	{
-		return SCARD_E_INVALID_VALUE;
-	}
-
 	if (pdwActiveProtocol == NULL)
 		return SCARD_E_INVALID_PARAMETER;
 
@@ -1028,14 +998,6 @@
 	DWORD dwContextIndex, dwChannelIndex;
 
 	PROFILE_START
-
-	if (dwDisposition != SCARD_LEAVE_CARD &&
-		dwDisposition != SCARD_RESET_CARD &&
-		dwDisposition != SCARD_UNPOWER_CARD &&
-		dwDisposition != SCARD_EJECT_CARD)
-	{
-		return SCARD_E_INVALID_VALUE;
-	}
 
 	rv = SCardCheckDaemonAvailability();
 	if (rv != SCARD_S_SUCCESS)
@@ -1264,14 +1226,6 @@
 	 * Zero out everything
 	 */
 	randnum = 0;
-
-	if (dwDisposition != SCARD_LEAVE_CARD &&
-		dwDisposition != SCARD_RESET_CARD &&
-		dwDisposition != SCARD_UNPOWER_CARD &&
-		dwDisposition != SCARD_EJECT_CARD)
-	{
-		return SCARD_E_INVALID_VALUE;
-	}
 
 	rv = SCardCheckDaemonAvailability();
 	if (rv != SCARD_S_SUCCESS)