[Pcsclite-cvs-commit] r5900 - in /trunk/PCSC/src: readerfactory.c readerfactory.h
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Sun Aug 21 13:53:34 UTC 2011
Author: rousseau
Date: Sun Aug 21 13:53:33 2011
New Revision: 5900
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5900
Log:
RFSetReaderName(): remove useless parameter slot
RFSetReaderName() is only called in one place with slot set to 0.
This parameter is then useless and can be removed.
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=5900&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Sun Aug 21 13:53:33 2011
@@ -172,7 +172,7 @@
/* Check and set the readername to see if it must be enumerated */
parentNode = RFSetReaderName(sReadersContexts[dwContext], readerName,
- library, port, 0);
+ library, port);
if (parentNode < -1)
return SCARD_E_NO_MEMORY;
@@ -549,7 +549,7 @@
}
LONG RFSetReaderName(READER_CONTEXT * rContext, const char *readerName,
- const char *libraryName, int port, DWORD slot)
+ const char *libraryName, int port)
{
LONG parent = -1; /* reader number of the parent of the clone */
DWORD valueLength;
@@ -562,7 +562,7 @@
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
usedDigits[i] = FALSE;
- if ((0 == slot) && (dwNumReadersContexts != 0))
+ if (dwNumReadersContexts != 0)
{
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
@@ -648,11 +648,11 @@
}
snprintf(rContext->readerState->readerName,
- sizeof(rContext->readerState->readerName), "%s %02X %02lX",
- readerName, i, slot);
+ sizeof(rContext->readerState->readerName), "%s %02X 00",
+ readerName, i);
/* Set the slot in 0xDDDDCCCC */
- rContext->slot = (i << 16) + slot;
+ rContext->slot = i << 16;
return parent;
}
Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=5900&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Sun Aug 21 13:53:33 2011
@@ -121,7 +121,7 @@
LONG RFAllocateReaderSpace(unsigned int);
LONG RFAddReader(const char *, int, const char *, const char *);
LONG RFRemoveReader(const char *, int);
- LONG RFSetReaderName(READER_CONTEXT *, const char *, const char *, int, DWORD);
+ LONG RFSetReaderName(READER_CONTEXT *, const char *, const char *, int);
LONG RFReaderInfo(const char *, /*@out@*/ struct ReaderContext **);
LONG RFReaderInfoNamePort(int, const char *, /*@out@*/ struct ReaderContext **);
LONG RFReaderInfoById(DWORD, /*@out@*/ struct ReaderContext **);
More information about the Pcsclite-cvs-commit
mailing list