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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Feb  9 14:29:06 2010
New Revision: 4735

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4735
Log:
In struct SerialReader rename dwChannelId in channelId since it is an
int and no more a DWORD

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

Modified: trunk/PCSC/src/configfile.l
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/configfile.l?rev=4735&op=diff
==============================================================================
--- trunk/PCSC/src/configfile.l (original)
+++ trunk/PCSC/src/configfile.l Tue Feb  9 14:29:06 2010
@@ -65,7 +65,7 @@
 int evaluatetoken(char *pcToken)
 {
 
-	DWORD dwChannelId = 0;
+	int channelId = 0;
 	int p = 0;
 	unsigned int n = 0;
 
@@ -196,11 +196,11 @@
 		/* end marker */
 		reader_list[reader_list_size-1].pcFriendlyname = NULL;
 
-		dwChannelId = strtoul(pcChannelid, 0, 16);
+		channelId = strtoul(pcChannelid, 0, 16);
 		reader_list[reader_list_size-2].pcFriendlyname = strdup(pcFriendlyname);
 		reader_list[reader_list_size-2].pcDevicename = strdup(pcDevicename);
 		reader_list[reader_list_size-2].pcLibpath = strdup(pcLibpath),
-		reader_list[reader_list_size-2].dwChannelId = dwChannelId;
+		reader_list[reader_list_size-2].channelId = channelId;
 
 		pcFriendlyname = NULL;
 		pcDevicename = NULL;

Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=4735&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Tue Feb  9 14:29:06 2010
@@ -1312,7 +1312,7 @@
 		int j;
 
 		(void)RFAddReader(reader_list[i].pcFriendlyname,
-			reader_list[i].dwChannelId,
+			reader_list[i].channelId,
 			reader_list[i].pcLibpath, reader_list[i].pcDevicename);
 
 		/* update the ConfigFileCRC (this false "CRC" is very weak) */
@@ -1390,7 +1390,7 @@
 				lpcStripReader[tmplen - 6] = 0;
 
 				if ((strcmp(reader_list[i].pcFriendlyname, lpcStripReader) == 0)
-					&& (reader_list[r].dwChannelId == sReadersContexts[i]->dwPort))
+					&& (reader_list[r].channelId == sReadersContexts[i]->dwPort))
 				{
 					DWORD dwStatus = 0, dwAtrLen = 0;
 					UCHAR ucAtr[MAX_ATR_SIZE];
@@ -1405,7 +1405,7 @@
 						Log2(PCSC_LOG_INFO, "Reader %s disappeared",
 							reader_list[i].pcFriendlyname);
 						(void)RFRemoveReader(reader_list[i].pcFriendlyname,
-							reader_list[r].dwChannelId);
+							reader_list[r].channelId);
 					}
 				}
 			}
@@ -1415,7 +1415,7 @@
 		if (!present)
 			/* we try to add it */
 			(void)RFAddReader(reader_list[i].pcFriendlyname,
-				reader_list[i].dwChannelId, reader_list[i].pcLibpath,
+				reader_list[i].channelId, reader_list[i].pcLibpath,
 				reader_list[i].pcDevicename);
 
 		/* free strings allocated by DBGetReaderList() */

Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=4735&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Tue Feb  9 14:29:06 2010
@@ -34,7 +34,7 @@
 		char *pcFriendlyname;	/**< FRIENDLYNAME */
 		char *pcDevicename;		/**< DEVICENAME */
 		char *pcLibpath;		/**< LIBPATH */
-		int dwChannelId;		/**< CHANNELID */
+		int channelId;		/**< CHANNELID */
 	} SerialReader;
 
 	struct FctMap_V1