[Pcsclite-cvs-commit] r5338 - in /trunk/PCSC/src: PCSC/winscard.h winscard_clnt.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Oct 22 09:33:49 2010
New Revision: 5338

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5338
Log:
SCardSetTimeout() is no more provided. 
This function is not provided by Microsoft and is deprecated since 2004
in pcsc-lite.

Modified:
    trunk/PCSC/src/PCSC/winscard.h
    trunk/PCSC/src/winscard_clnt.c

Modified: trunk/PCSC/src/PCSC/winscard.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/winscard.h?rev=5338&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/winscard.h (original)
+++ trunk/PCSC/src/PCSC/winscard.h Fri Oct 22 09:33:49 2010
@@ -35,8 +35,6 @@
 	PCSC_API LONG SCardReleaseContext(SCARDCONTEXT hContext);
 
 	PCSC_API LONG SCardIsValidContext(SCARDCONTEXT hContext);
-
-	PCSC_API LONG SCardSetTimeout(SCARDCONTEXT hContext, DWORD dwTimeout);
 
 	PCSC_API LONG SCardConnect(SCARDCONTEXT hContext,
 		LPCSTR szReader,

Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=5338&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Oct 22 09:33:49 2010
@@ -728,32 +728,6 @@
 	PROFILE_END(rv)
 
 	return rv;
-}
-
-/**
- * @brief The function does not do anything except returning \ref
- * SCARD_S_SUCCESS.
- *
- * @deprecated
- * This function is not in Microsoft(R) WinSCard API and is deprecated
- * in pcsc-lite API.
- *
- * @ingroup API
- * @param[in] hContext Connection context to the PC/SC Resource Manager.
- * @param[in] dwTimeout New timeout value.
- *
- * @return Error code.
- * @retval SCARD_S_SUCCESS Successful (\ref SCARD_S_SUCCESS)
- */
-LONG SCardSetTimeout(/*@unused@*/ SCARDCONTEXT hContext,
-	/*@unused@*/ DWORD dwTimeout)
-{
-	/*
-	 * Deprecated
-	 */
-	(void)hContext;
-	(void)dwTimeout;
-	return SCARD_S_SUCCESS;
 }
 
 /**