[Pcsclite-cvs-commit] r4456 - in /trunk/PCSC/src: readerfactory.c readerfactory.h

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Thu Oct 8 12:21:35 UTC 2009


Author: rousseau
Date: Thu Oct  8 12:21:34 2009
New Revision: 4456

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4456
Log:
remove useless RFListReaders()

Modified:
    trunk/PCSC/src/readerfactory.c
    trunk/PCSC/src/readerfactory.h

Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=4456&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Thu Oct  8 12:21:34 2009
@@ -584,84 +584,6 @@
 	return parent;
 }
 
-#if 0
-LONG RFListReaders(LPSTR lpcReaders, LPDWORD pdwReaderNum)
-{
-	DWORD dwCSize;
-	LPSTR lpcTReaders;
-	int i, p;
-
-	if (dwNumReadersContexts == 0)
-		return SCARD_E_READER_UNAVAILABLE;
-
-	/*
-	 * Ignore the groups for now, return all readers
-	 */
-	dwCSize = 0;
-	p = 0;
-
-	for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
-	{
-		if ((sReadersContexts[i])->vHandle != 0)
-		{
-			dwCSize += strlen((sReadersContexts[i])->lpcReader) + 1;
-			p += 1;
-		}
-	}
-
-	if (p > dwNumReadersContexts)
-		/*
-		 * We are severely hosed here
-		 */
-		/*
-		 * Hopefully this will never be true
-		 */
-		return SCARD_F_UNKNOWN_ERROR;
-
-	/*
-	 * Added for extra NULL byte on MultiString
-	 */
-	dwCSize += 1;
-
-	/*
-	 * If lpcReaders is not allocated then just
-	 */
-	/*
-	 * return the amount needed to allocate
-	 */
-	if (lpcReaders == 0)
-	{
-		*pdwReaderNum = dwCSize;
-		return SCARD_S_SUCCESS;
-	}
-
-	if (*pdwReaderNum < dwCSize)
-		return SCARD_E_INSUFFICIENT_BUFFER;
-
-	*pdwReaderNum = dwCSize;
-	lpcTReaders = lpcReaders;
-	p = 0;
-
-	/*
-	 * Creating MultiString
-	 */
-	for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
-	{
-		if ((sReadersContexts[i])->vHandle != 0)
-		{
-			strcpy(&lpcTReaders[p], (sReadersContexts[i])->lpcReader);
-			p += strlen((sReadersContexts[i])->lpcReader);	/* Copy */
-			lpcTReaders[p] = 0;	/* Add NULL */
-			p += 1;	/* Move on */
-		}
-	}
-
-	lpcTReaders[p] = 0;	/* Add NULL */
-
-	return SCARD_S_SUCCESS;
-}
-#endif
-
 LONG RFReaderInfo(LPSTR lpcReader, PREADER_CONTEXT * sReader)
 {
 	int i;

Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=4456&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Thu Oct  8 12:21:34 2009
@@ -142,7 +142,6 @@
 	LONG RFAddReader(LPSTR, DWORD, LPSTR, LPSTR);
 	LONG RFRemoveReader(LPSTR, DWORD);
 	LONG RFSetReaderName(PREADER_CONTEXT, LPSTR, LPSTR, DWORD, DWORD);
-	LONG RFListReaders(LPSTR, LPDWORD);
 	LONG RFReaderInfo(LPSTR, /*@out@*/ struct ReaderContext **);
 	LONG RFReaderInfoNamePort(DWORD, LPSTR, /*@out@*/ struct ReaderContext **);
 	LONG RFReaderInfoById(DWORD, /*@out@*/ struct ReaderContext **);




More information about the Pcsclite-cvs-commit mailing list