[Pcsclite-cvs-commit] PCSC/src winscard_scf.c,1.13,1.14 winscard_clnt.c,1.37,1.38 eventhandler.h,1.4,1.5 eventhandler.c,1.20,1.21

rousseau@haydn.debian.org rousseau@haydn.debian.org


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

Modified Files:
	winscard_scf.c winscard_clnt.c eventhandler.h eventhandler.c 
Log Message:
rename the structure READER_STATES in READER_STATE (singular) since the
structure stores only the state of ONE reader


Index: winscard_scf.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_scf.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- winscard_scf.c	17 Jun 2004 06:44:01 -0000	1.13
+++ winscard_scf.c	17 Jun 2004 07:44:03 -0000	1.14
@@ -665,7 +665,7 @@
 
   LONG rv, retIndice;
    PSCARD_READERSTATE_A currReader;
-  PREADER_STATES rContext;
+  PREADER_STATE rContext;
   LPTSTR lpcReaderName;
   DWORD dwTime;
   DWORD dwState;

Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- winscard_clnt.c	10 Jun 2004 14:57:47 -0000	1.37
+++ winscard_clnt.c	17 Jun 2004 07:44:03 -0000	1.38
@@ -66,7 +66,7 @@
 
 static PCSCLITE_MUTEX clientMutex = PTHREAD_MUTEX_INITIALIZER;
 
-static PREADER_STATES readerStates[PCSCLITE_MAX_READERS_CONTEXTS];
+static PREADER_STATE readerStates[PCSCLITE_MAX_READERS_CONTEXTS];
 
 SCARD_IO_REQUEST g_rgSCardT0Pci = { SCARD_PROTOCOL_T0, 8 };
 SCARD_IO_REQUEST g_rgSCardT1Pci = { SCARD_PROTOCOL_T1, 8 };
@@ -168,8 +168,8 @@
 		 */
 		for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
 		{
-			readerStates[i] = (PREADER_STATES)
-				SYS_PublicMemoryMap(sizeof(READER_STATES),
+			readerStates[i] = (PREADER_STATE)
+				SYS_PublicMemoryMap(sizeof(READER_STATE),
 				mapAddr, (i * pageSize));
 			if (readerStates[i] == NULL)
 			{
@@ -1067,7 +1067,7 @@
 {
 	LONG rv;
 	PSCARD_READERSTATE_A currReader;
-	PREADER_STATES rContext;
+	PREADER_STATE rContext;
 	LPTSTR lpcReaderName;
 	DWORD dwTime;
 	DWORD dwState;

Index: eventhandler.h
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/eventhandler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- eventhandler.h	17 Jun 2004 06:44:01 -0000	1.4
+++ eventhandler.h	17 Jun 2004 07:44:03 -0000	1.5
@@ -6,6 +6,8 @@
  *
  * Copyright (C) 1999
  *  David Corcoran <corcoran@linuxnet.com>
+ * Copyright (C) 2004
+ *  Ludovic Rousseau <ludovic.rousseau@free.fr>
  *
  * $Id$
  */
@@ -23,7 +25,7 @@
 	 * application gets instant notification of changes in state. 
 	 */
 
-	typedef struct pubReaderStatesList
+	typedef struct
 	{
 		LONG readerID;
 		char readerName[MAX_READERNAME];
@@ -35,7 +37,7 @@
 		DWORD cardAtrLength;
 		DWORD cardProtocol;
 	}
-	READER_STATES, *PREADER_STATES;
+	READER_STATE, *PREADER_STATE;
 
 	LONG EHInitializeEventStructures(void);
 	LONG EHSpawnEventHandler(PREADER_CONTEXT);

Index: eventhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/eventhandler.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- eventhandler.c	17 Jun 2004 06:44:01 -0000	1.20
+++ eventhandler.c	17 Jun 2004 07:44:03 -0000	1.21
@@ -31,7 +31,7 @@
 #include "ifdwrapper.h"
 #include "prothandler.h"
 
-static PREADER_STATES readerStates[PCSCLITE_MAX_READERS_CONTEXTS];
+static PREADER_STATE readerStates[PCSCLITE_MAX_READERS_CONTEXTS];
 
 void EHStatusHandlerThread(PREADER_CONTEXT);
 
@@ -69,8 +69,8 @@
 	 */
 	for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
 	{
-		readerStates[i] = (PREADER_STATES)
-			SYS_MemoryMap(sizeof(READER_STATES), fd, (i * pageSize));
+		readerStates[i] = (PREADER_STATE)
+			SYS_MemoryMap(sizeof(READER_STATE), fd, (i * pageSize));
 		if (readerStates[i] == 0)
 		{
 			DebugLogC("Cannot memory map public shared file %s: %s",