[Pcsclite-cvs-commit] CVS PCSC/src

[CVS User rousseau]

Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv7698

Modified Files:
	winscard_clnt.c 
Log Message:
move the Doxygen for SCardCancel() to the correct function (it was
attached to SCardCancelTransaction())


--- /cvsroot/pcsclite/PCSC/src/winscard_clnt.c	2005/07/27 09:36:25	1.58
+++ /cvsroot/pcsclite/PCSC/src/winscard_clnt.c	2005/07/27 09:50:19	1.59
@@ -6,7 +6,7 @@
  *  Damien Sauveron <damien.sauveron at labri.fr>
  *  Ludovic Rousseau <ludovic.rousseau at free.fr>
  *
- * $Id: winscard_clnt.c,v 1.58 2005/07/27 09:36:25 rousseau Exp $
+ * $Id: winscard_clnt.c,v 1.59 2005/07/27 09:50:19 rousseau Exp $
  */
 
 /**
@@ -1154,33 +1154,6 @@
 	return scEndStruct.rv;
 }
 
-/**
- * This function cancels all pending blocking requests on the
- * \c SCardGetStatusChange() function.
- *
- * @param[in] hCard Connection context to the PC/SC Resource Manager.
- *
- * @return Error code.
- * @retval SCARD_S_SUCCESS Successful.
- * @retval SCARD_E_INVALID_HANDLE Invalid \p hContext handle.
- *
- * @test
- * @code
- * SCARDCONTEXT hContext;
- * DWORD cReaders;
- * SCARD_READERSTATE rgReaderStates;
- * LONG rv;
- * ...
- * rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
- * rgReaderStates.szReader = strdup("Reader X");
- * rgReaderStates.dwCurrentState = SCARD_STATE_EMPTY;
- * ...
- * / * Spawn off thread for following function * /
- * ...
- * rv = SCardGetStatusChange(hContext, 0, rgReaderStates, cReaders);
- * rv = SCardCancel(hContext);
- * @endcode
- */
 LONG SCardCancelTransaction(SCARDHANDLE hCard)
 {
 	LONG rv;
@@ -2702,6 +2675,33 @@
 	return rv;
 }
 
+/**
+ * This function cancels all pending blocking requests on the
+ * \c SCardGetStatusChange() function.
+ *
+ * @param[in] hCard Connection context to the PC/SC Resource Manager.
+ *
+ * @return Error code.
+ * @retval SCARD_S_SUCCESS Successful.
+ * @retval SCARD_E_INVALID_HANDLE Invalid \p hContext handle.
+ *
+ * @test
+ * @code
+ * SCARDCONTEXT hContext;
+ * DWORD cReaders;
+ * SCARD_READERSTATE rgReaderStates;
+ * LONG rv;
+ * ...
+ * rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
+ * rgReaderStates.szReader = strdup("Reader X");
+ * rgReaderStates.dwCurrentState = SCARD_STATE_EMPTY;
+ * ...
+ * / * Spawn off thread for following function * /
+ * ...
+ * rv = SCardGetStatusChange(hContext, 0, rgReaderStates, cReaders);
+ * rv = SCardCancel(hContext);
+ * @endcode
+ */
 LONG SCardCancel(SCARDCONTEXT hContext)
 {
 	DWORD dwContextIndex;