Use READER_CONTEXT * instead of PREADER_CONTEXT to make it explicit it

is a pointer


git-svn-id: svn:https://anonscm.debian.org/svn/pcsclite/trunk/PCSC@4727 0ce88b0d-b2fd-0310-8134-9614164e65ea

src/eventhandler.c

@@ -43,7 +43,7 @@ READER_STATE readerStates[PCSCLITE_MAX_READERS_CONTEXTS];
 static list_t ClientsWaitingForEvent; /**< list of client file descriptors */
 PCSCLITE_MUTEX ClientsWaitingForEvent_lock; /**< lock for the above list */
 
-static void EHStatusHandlerThread(PREADER_CONTEXT);
+static void EHStatusHandlerThread(READER_CONTEXT *);
 
 LONG EHRegisterClientForEvent(int32_t filedes)
 {
@@ -144,7 +144,7 @@ LONG EHInitializeEventStructures(void)
  return SCARD_S_SUCCESS;
 }
 
-LONG EHDestroyEventHandler(PREADER_CONTEXT rContext)
+LONG EHDestroyEventHandler(READER_CONTEXT * rContext)
 {
  int rv;
  DWORD dwGetSize;
@@ -209,7 +209,7 @@ LONG EHDestroyEventHandler(PREADER_CONTEXT rContext)
  return SCARD_S_SUCCESS;
 }
 
-LONG EHSpawnEventHandler(PREADER_CONTEXT rContext,
+LONG EHSpawnEventHandler(READER_CONTEXT * rContext,
  RESPONSECODE (*card_event)(DWORD))
 {
  LONG rv;
@@ -272,7 +272,7 @@ static void incrementEventCounter(struct pubReaderStatesList *readerState)
  + (counter << 16);
 }
 
-static void EHStatusHandlerThread(PREADER_CONTEXT rContext)
+static void EHStatusHandlerThread(READER_CONTEXT * rContext)
 {
  LONG rv;
  LPCSTR lpcReader;

src/eventhandler.h

@@ -47,9 +47,9 @@ extern "C"
  LONG EHUnregisterClientForEvent(int32_t filedes); 
  LONG EHSignalEventToClients(void);
  LONG EHInitializeEventStructures(void);
- LONG EHSpawnEventHandler(PREADER_CONTEXT,
+ LONG EHSpawnEventHandler(READER_CONTEXT *,
  /*@null@*/ RESPONSECODE (*)(DWORD));
- LONG EHDestroyEventHandler(PREADER_CONTEXT);
+ LONG EHDestroyEventHandler(READER_CONTEXT *);
 
 /** Some defines for context stack. */
 #define SCARD_LAST_CONTEXT 1

src/ifdwrapper.c

@@ -34,7 +34,7 @@
  * Set the protocol type selection (PTS).
  * This function sets the appropriate protocol to be used on the card.
  */
-LONG IFDSetPTS(PREADER_CONTEXT rContext, DWORD dwProtocol, UCHAR ucFlags,
+LONG IFDSetPTS(READER_CONTEXT * rContext, DWORD dwProtocol, UCHAR ucFlags,
  UCHAR ucPTS1, UCHAR ucPTS2, UCHAR ucPTS3)
 {
  RESPONSECODE rv = IFD_SUCCESS;
@@ -107,7 +107,7 @@ LONG IFDSetPTS(PREADER_CONTEXT rContext, DWORD dwProtocol, UCHAR ucFlags,
 /**
  * Open a communication channel to the IFD.
  */
-LONG IFDOpenIFD(PREADER_CONTEXT rContext)
+LONG IFDOpenIFD(READER_CONTEXT * rContext)
 {
  RESPONSECODE rv = 0;
 
@@ -175,7 +175,7 @@ LONG IFDOpenIFD(PREADER_CONTEXT rContext)
 /**
  * Close a communication channel to the IFD.
  */
-LONG IFDCloseIFD(PREADER_CONTEXT rContext)
+LONG IFDCloseIFD(READER_CONTEXT * rContext)
 {
  RESPONSECODE rv = IFD_SUCCESS;
  int repeat;
@@ -228,7 +228,7 @@ LONG IFDCloseIFD(PREADER_CONTEXT rContext)
 /**
  * Set capabilities in the reader.
  */
-LONG IFDSetCapabilities(PREADER_CONTEXT rContext, DWORD dwTag,
+LONG IFDSetCapabilities(READER_CONTEXT * rContext, DWORD dwTag,
  DWORD dwLength, PUCHAR pucValue)
 {
  RESPONSECODE rv = IFD_SUCCESS;
@@ -270,7 +270,7 @@ LONG IFDSetCapabilities(PREADER_CONTEXT rContext, DWORD dwTag,
  * Other functions int this file will call
  * the driver directly to not cause a deadlock.
  */
-LONG IFDGetCapabilities(PREADER_CONTEXT rContext, DWORD dwTag,
+LONG IFDGetCapabilities(READER_CONTEXT * rContext, DWORD dwTag,
  PDWORD pdwLength, PUCHAR pucValue)
 {
  RESPONSECODE rv = IFD_SUCCESS;
@@ -313,7 +313,7 @@ LONG IFDGetCapabilities(PREADER_CONTEXT rContext, DWORD dwTag,
 /**
  * Power up/down or reset's an ICC located in the IFD.
  */
-LONG IFDPowerICC(PREADER_CONTEXT rContext, DWORD dwAction,
+LONG IFDPowerICC(READER_CONTEXT * rContext, DWORD dwAction,
  PUCHAR pucAtr, PDWORD pdwAtrLen)
 {
  RESPONSECODE rv;
@@ -410,7 +410,7 @@ LONG IFDPowerICC(PREADER_CONTEXT rContext, DWORD dwAction,
  * Provide statistical information about the IFD and ICC including insertions,
  * atr, powering status/etc.
  */
-LONG IFDStatusICC(PREADER_CONTEXT rContext, PDWORD pdwStatus,
+LONG IFDStatusICC(READER_CONTEXT * rContext, PDWORD pdwStatus,
  PUCHAR pucAtr, PDWORD pdwAtrLen)
 {
  RESPONSECODE rv = IFD_SUCCESS;
@@ -553,7 +553,7 @@ LONG IFDStatusICC(PREADER_CONTEXT rContext, PDWORD pdwStatus,
  * Valid only for IFDHandler version 2.0
  */
 
-LONG IFDControl_v2(PREADER_CONTEXT rContext, PUCHAR TxBuffer,
+LONG IFDControl_v2(READER_CONTEXT * rContext, PUCHAR TxBuffer,
  DWORD TxLength, PUCHAR RxBuffer, PDWORD RxLength)
 {
  RESPONSECODE rv = IFD_SUCCESS;
@@ -604,7 +604,7 @@ LONG IFDControl_v2(PREADER_CONTEXT rContext, PUCHAR TxBuffer,
  * Valid only for IFDHandler version 3.0 and up
  */
 
-LONG IFDControl(PREADER_CONTEXT rContext, DWORD ControlCode,
+LONG IFDControl(READER_CONTEXT * rContext, DWORD ControlCode,
  LPCVOID TxBuffer, DWORD TxLength, LPVOID RxBuffer, DWORD RxLength,
  LPDWORD BytesReturned)
 {
@@ -664,7 +664,7 @@ LONG IFDControl(PREADER_CONTEXT rContext, DWORD ControlCode,
 /**
  * Transmit an APDU to the ICC.
  */
-LONG IFDTransmit(PREADER_CONTEXT rContext, SCARD_IO_HEADER pioTxPci,
+LONG IFDTransmit(READER_CONTEXT * rContext, SCARD_IO_HEADER pioTxPci,
  PUCHAR pucTxBuffer, DWORD dwTxLength, PUCHAR pucRxBuffer,
  PDWORD pdwRxLength, PSCARD_IO_HEADER pioRxPci)
 {

src/ifdwrapper.h

@@ -23,20 +23,20 @@ extern "C"
 {
 #endif
 
- LONG IFDOpenIFD(PREADER_CONTEXT);
- LONG IFDCloseIFD(PREADER_CONTEXT);
- LONG IFDPowerICC(PREADER_CONTEXT, DWORD, PUCHAR, /*@out@*/ PDWORD);
- LONG IFDStatusICC(PREADER_CONTEXT, /*@out@*/ PDWORD, /*@out@*/ PUCHAR,
+ LONG IFDOpenIFD(READER_CONTEXT *);
+ LONG IFDCloseIFD(READER_CONTEXT *);
+ LONG IFDPowerICC(READER_CONTEXT *, DWORD, PUCHAR, /*@out@*/ PDWORD);
+ LONG IFDStatusICC(READER_CONTEXT *, /*@out@*/ PDWORD, /*@out@*/ PUCHAR,
  /*@out@*/ PDWORD);
- LONG IFDControl_v2(PREADER_CONTEXT, PUCHAR, DWORD, /*@out@*/ PUCHAR,
+ LONG IFDControl_v2(READER_CONTEXT *, PUCHAR, DWORD, /*@out@*/ PUCHAR,
  PDWORD);
- LONG IFDControl(PREADER_CONTEXT, DWORD, LPCVOID, DWORD, LPVOID,
+ LONG IFDControl(READER_CONTEXT *, DWORD, LPCVOID, DWORD, LPVOID,
  DWORD, LPDWORD);
- LONG IFDTransmit(PREADER_CONTEXT, SCARD_IO_HEADER,
+ LONG IFDTransmit(READER_CONTEXT *, SCARD_IO_HEADER,
  PUCHAR, DWORD, /*@out@*/ PUCHAR, PDWORD, PSCARD_IO_HEADER);
- LONG IFDSetPTS(PREADER_CONTEXT, DWORD, UCHAR, UCHAR, UCHAR, UCHAR);
- LONG IFDSetCapabilities(PREADER_CONTEXT, DWORD, DWORD, PUCHAR);
- LONG IFDGetCapabilities(PREADER_CONTEXT, DWORD, PDWORD, /*@out@*/ PUCHAR);
+ LONG IFDSetPTS(READER_CONTEXT *, DWORD, UCHAR, UCHAR, UCHAR, UCHAR);
+ LONG IFDSetCapabilities(READER_CONTEXT *, DWORD, DWORD, PUCHAR);
+ LONG IFDGetCapabilities(READER_CONTEXT *, DWORD, PDWORD, /*@out@*/ PUCHAR);
 
 #ifdef __cplusplus
 }

src/readerfactory.c

@@ -48,7 +48,7 @@
 #define FALSE 0
 #endif
 
-static PREADER_CONTEXT sReadersContexts[PCSCLITE_MAX_READERS_CONTEXTS];
+static READER_CONTEXT * sReadersContexts[PCSCLITE_MAX_READERS_CONTEXTS];
 static int maxReaderHandles = PCSC_MAX_READER_HANDLES;
 static DWORD dwNumReadersContexts = 0;
 static char *ConfigFile = NULL;
@@ -444,7 +444,7 @@ LONG RFAddReader(LPSTR lpcReader, DWORD dwPort, LPSTR lpcLibrary, LPSTR lpcDevic
 LONG RFRemoveReader(LPSTR lpcReader, DWORD dwPort)
 {
  LONG rv;
- PREADER_CONTEXT sContext;
+ READER_CONTEXT * sContext;
 
  if (lpcReader == 0)
  return SCARD_E_INVALID_VALUE;
@@ -530,7 +530,7 @@ LONG RFRemoveReader(LPSTR lpcReader, DWORD dwPort)
  return SCARD_S_SUCCESS;
 }
 
-LONG RFSetReaderName(PREADER_CONTEXT rContext, LPSTR readerName,
+LONG RFSetReaderName(READER_CONTEXT * rContext, LPSTR readerName,
  LPSTR libraryName, DWORD dwPort, DWORD dwSlot)
 {
  LONG parent = -1; /* reader number of the parent of the clone */
@@ -638,7 +638,7 @@ LONG RFSetReaderName(PREADER_CONTEXT rContext, LPSTR readerName,
  return parent;
 }
 
-LONG RFReaderInfo(LPSTR lpcReader, PREADER_CONTEXT * sReader)
+LONG RFReaderInfo(LPSTR lpcReader, READER_CONTEXT ** sReader)
 {
  int i;
 
@@ -661,7 +661,7 @@ LONG RFReaderInfo(LPSTR lpcReader, PREADER_CONTEXT * sReader)
 }
 
 LONG RFReaderInfoNamePort(DWORD dwPort, LPSTR lpcReader,
- PREADER_CONTEXT * sReader)
+ READER_CONTEXT * * sReader)
 {
  char lpcStripReader[MAX_READERNAME];
  int i;
@@ -689,7 +689,7 @@ LONG RFReaderInfoNamePort(DWORD dwPort, LPSTR lpcReader,
  return SCARD_E_INVALID_VALUE;
 }
 
-LONG RFReaderInfoById(DWORD dwIdentity, PREADER_CONTEXT * sReader)
+LONG RFReaderInfoById(DWORD dwIdentity, READER_CONTEXT * * sReader)
 {
  int i;
 
@@ -709,7 +709,7 @@ LONG RFReaderInfoById(DWORD dwIdentity, PREADER_CONTEXT * sReader)
  return SCARD_E_INVALID_VALUE;
 }
 
-LONG RFLoadReader(PREADER_CONTEXT rContext)
+LONG RFLoadReader(READER_CONTEXT * rContext)
 {
  if (rContext->vHandle != 0)
  {
@@ -722,7 +722,7 @@ LONG RFLoadReader(PREADER_CONTEXT rContext)
  return DYN_LoadLibrary(&rContext->vHandle, rContext->lpcLibrary);
 }
 
-LONG RFBindFunctions(PREADER_CONTEXT rContext)
+LONG RFBindFunctions(READER_CONTEXT * rContext)
 {
  int rv1, rv2, rv3;
  void *f;
@@ -877,15 +877,15 @@ LONG RFBindFunctions(PREADER_CONTEXT rContext)
  return SCARD_S_SUCCESS;
 }
 
-LONG RFUnBindFunctions(PREADER_CONTEXT rContext)
+LONG RFUnBindFunctions(READER_CONTEXT * rContext)
 {
  /* Zero out everything */
  memset(&rContext->psFunctions, 0, sizeof(rContext->psFunctions));
 
  return SCARD_S_SUCCESS;
 }
 
-LONG RFUnloadReader(PREADER_CONTEXT rContext)
+LONG RFUnloadReader(READER_CONTEXT * rContext)
 {
  /* Make sure no one else is using this library */
  if (*rContext->pdwFeeds == 1)
@@ -902,7 +902,7 @@ LONG RFUnloadReader(PREADER_CONTEXT rContext)
 LONG RFCheckSharing(DWORD hCard)
 {
  LONG rv;
- PREADER_CONTEXT rContext = NULL;
+ READER_CONTEXT * rContext = NULL;
 
  rv = RFReaderInfoById(hCard, &rContext);
 
@@ -917,7 +917,7 @@ LONG RFCheckSharing(DWORD hCard)
 
 LONG RFLockSharing(DWORD hCard)
 {
- PREADER_CONTEXT rContext = NULL;
+ READER_CONTEXT * rContext = NULL;
  LONG rv;
 
  (void)RFReaderInfoById(hCard, &rContext);
@@ -936,7 +936,7 @@ LONG RFLockSharing(DWORD hCard)
 
 LONG RFUnlockSharing(DWORD hCard)
 {
- PREADER_CONTEXT rContext = NULL;
+ READER_CONTEXT * rContext = NULL;
  LONG rv;
 
  rv = RFReaderInfoById(hCard, &rContext);
@@ -959,7 +959,7 @@ LONG RFUnlockSharing(DWORD hCard)
 
 LONG RFUnlockAllSharing(DWORD hCard)
 {
- PREADER_CONTEXT rContext = NULL;
+ READER_CONTEXT * rContext = NULL;
  LONG rv;
 
  rv = RFReaderInfoById(hCard, &rContext);
@@ -978,7 +978,7 @@ LONG RFUnlockAllSharing(DWORD hCard)
  return rv;
 }
 
-LONG RFInitializeReader(PREADER_CONTEXT rContext)
+LONG RFInitializeReader(READER_CONTEXT * rContext)
 {
  LONG rv;
 
@@ -1027,7 +1027,7 @@ LONG RFInitializeReader(PREADER_CONTEXT rContext)
  return SCARD_S_SUCCESS;
 }
 
-LONG RFUnInitializeReader(PREADER_CONTEXT rContext)
+LONG RFUnInitializeReader(READER_CONTEXT * rContext)
 {
  Log2(PCSC_LOG_INFO, "Attempting shutdown of %s.",
  rContext->lpcReader);
@@ -1047,7 +1047,7 @@ LONG RFUnInitializeReader(PREADER_CONTEXT rContext)
  return SCARD_S_SUCCESS;
 }
 
-SCARDHANDLE RFCreateReaderHandle(PREADER_CONTEXT rContext)
+SCARDHANDLE RFCreateReaderHandle(READER_CONTEXT * rContext)
 {
  USHORT randHandle;
 
@@ -1114,7 +1114,7 @@ LONG RFDestroyReaderHandle(/*@unused@*/ SCARDHANDLE hCard)
  return SCARD_S_SUCCESS;
 }
 
-LONG RFAddReaderHandle(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
+LONG RFAddReaderHandle(READER_CONTEXT * rContext, SCARDHANDLE hCard)
 {
  int listLength, lrv;
  RDR_CLIHANDLES *newHandle;
@@ -1151,7 +1151,7 @@ LONG RFAddReaderHandle(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
  return SCARD_S_SUCCESS;
 }
 
-LONG RFRemoveReaderHandle(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
+LONG RFRemoveReaderHandle(READER_CONTEXT * rContext, SCARDHANDLE hCard)
 {
  RDR_CLIHANDLES *currentHandle;
  int lrv;
@@ -1174,7 +1174,7 @@ LONG RFRemoveReaderHandle(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
  return SCARD_S_SUCCESS;
 }
 
-LONG RFSetReaderEventState(PREADER_CONTEXT rContext, DWORD dwEvent)
+LONG RFSetReaderEventState(READER_CONTEXT * rContext, DWORD dwEvent)
 {
  /* Set all the handles for that reader to the event */
  int list_index, listSize;
@@ -1205,7 +1205,7 @@ LONG RFSetReaderEventState(PREADER_CONTEXT rContext, DWORD dwEvent)
  return SCARD_S_SUCCESS;
 }
 
-LONG RFCheckReaderEventState(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
+LONG RFCheckReaderEventState(READER_CONTEXT * rContext, SCARDHANDLE hCard)
 {
  LONG rv;
  RDR_CLIHANDLES *currentHandle;
@@ -1239,7 +1239,7 @@ LONG RFCheckReaderEventState(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
  return rv;
 }
 
-LONG RFClearReaderEventState(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
+LONG RFClearReaderEventState(READER_CONTEXT * rContext, SCARDHANDLE hCard)
 {
  RDR_CLIHANDLES *currentHandle;
 
@@ -1256,7 +1256,7 @@ LONG RFClearReaderEventState(PREADER_CONTEXT rContext, SCARDHANDLE hCard)
  return SCARD_S_SUCCESS;
 }
 
-LONG RFCheckReaderStatus(PREADER_CONTEXT rContext)
+LONG RFCheckReaderStatus(READER_CONTEXT * rContext)
 {
  if ((rContext->readerState == NULL)
  || (rContext->readerState->readerState & SCARD_UNKNOWN))