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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jun  5 09:07:46 2012
New Revision: 6321

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6321
Log:
remove dwIdentity field from ReaderContext structure

Since revision 6320 dwIdentity is no more used. So we can remove it.

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=6321&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Tue Jun  5 09:07:46 2012
@@ -189,8 +189,6 @@
 	sReadersContexts[dwContext]->pFeeds = NULL;
 	sReadersContexts[dwContext]->pMutex = NULL;
 	sReadersContexts[dwContext]->pthCardEvent = NULL;
-	sReadersContexts[dwContext]->dwIdentity =
-		(dwContext + 1) << IDENTITY_SHIFT;
 
 	lrv = list_init(&sReadersContexts[dwContext]->handlesList);
 	if (lrv < 0)
@@ -386,8 +384,6 @@
 		sReadersContexts[dwContextB]->contexts = 0;
 		sReadersContexts[dwContextB]->hLockId = 0;
 		sReadersContexts[dwContextB]->LockCount = 0;
-		sReadersContexts[dwContextB]->dwIdentity =
-			(dwContextB + 1) << IDENTITY_SHIFT;
 
 		lrv = list_init(&sReadersContexts[dwContextB]->handlesList);
 		if (lrv < 0)
@@ -522,7 +518,6 @@
 		sContext->hLockId = 0;
 		sContext->LockCount = 0;
 		sContext->vHandle = NULL;
-		sContext->dwIdentity = 0;
 
 		(void)pthread_mutex_lock(&sContext->handlesList_lock);
 		while (list_size(&(sContext->handlesList)) != 0)

Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=6321&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Tue Jun  5 09:07:46 2012
@@ -103,7 +103,6 @@
 		int port;				/**< Port ID */
 		int slot;				/**< Current Reader Slot */
 		SCARDHANDLE hLockId;	/**< Lock Id */
-		DWORD dwIdentity;		/**< Shared ID High Nibble */
 		int LockCount;			/**< number of recursive locks */
 		int32_t contexts;		/**< Number of open contexts */
 		int * pFeeds;			/**< Number of shared client to lib */