[Pcsclite-cvs-commit] r4525 - /trunk/PCSC/src/eventhandler.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Wed Oct 28 15:00:46 UTC 2009


Author: rousseau
Date: Wed Oct 28 15:00:45 2009
New Revision: 4525

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4525
Log:
correctly use the lock API for ClientsWaitingForEvent_lock

Modified:
    trunk/PCSC/src/eventhandler.c

Modified: trunk/PCSC/src/eventhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/eventhandler.c?rev=4525&op=diff
==============================================================================
--- trunk/PCSC/src/eventhandler.c (original)
+++ trunk/PCSC/src/eventhandler.c Wed Oct 28 15:00:45 2009
@@ -41,17 +41,17 @@
 
 READER_STATE readerStates[PCSCLITE_MAX_READERS_CONTEXTS];
 static list_t ClientsWaitingForEvent;	/**< list of client file descriptors */
-PCSCLITE_MUTEX_T ClientsWaitingForEvent_lock;	/**< lock for the above list */
+PCSCLITE_MUTEX ClientsWaitingForEvent_lock;	/**< lock for the above list */
 
 static void EHStatusHandlerThread(PREADER_CONTEXT);
 
 LONG EHRegisterClientForEvent(int32_t filedes)
 {
-	(void)SYS_MutexLock(ClientsWaitingForEvent_lock);
+	(void)SYS_MutexLock(&ClientsWaitingForEvent_lock);
 
 	(void)list_append(&ClientsWaitingForEvent, &filedes);
 	
-	(void)SYS_MutexUnLock(ClientsWaitingForEvent_lock);
+	(void)SYS_MutexUnLock(&ClientsWaitingForEvent_lock);
 
 	return SCARD_S_SUCCESS;
 } /* EHRegisterClientForEvent */
@@ -65,12 +65,12 @@
 	LONG rv = SCARD_S_SUCCESS;
 	int pos, ret;
 
-	(void)SYS_MutexLock(ClientsWaitingForEvent_lock);
+	(void)SYS_MutexLock(&ClientsWaitingForEvent_lock);
 
 	pos = list_locate(&ClientsWaitingForEvent, &filedes);
 	ret = list_delete_at(&ClientsWaitingForEvent, pos);
 	
-	(void)SYS_MutexUnLock(ClientsWaitingForEvent_lock);
+	(void)SYS_MutexUnLock(&ClientsWaitingForEvent_lock);
 	
 	if (ret < 0)
 		rv = SCARD_F_INTERNAL_ERROR;
@@ -99,7 +99,7 @@
 	LONG rv = SCARD_S_SUCCESS;
 	int32_t filedes;
 
-	(void)SYS_MutexLock(ClientsWaitingForEvent_lock);
+	(void)SYS_MutexLock(&ClientsWaitingForEvent_lock);
 
 	(void)list_iterator_start(&ClientsWaitingForEvent);
 	while (list_iterator_hasnext(&ClientsWaitingForEvent))
@@ -111,7 +111,7 @@
 
 	(void)list_clear(&ClientsWaitingForEvent);
 
-	(void)SYS_MutexUnLock(ClientsWaitingForEvent_lock);
+	(void)SYS_MutexUnLock(&ClientsWaitingForEvent_lock);
 
 	return rv;
 } /* EHSignalEventToClients */
@@ -140,7 +140,7 @@
 	/* setting the comparator, so the list can sort, find the min, max etc */
     (void)list_attributes_comparator(&ClientsWaitingForEvent, list_comparator_int32_t);
 
-	(void)SYS_MutexInit(ClientsWaitingForEvent_lock);
+	(void)SYS_MutexInit(&ClientsWaitingForEvent_lock);
 
 	return SCARD_S_SUCCESS;
 }




More information about the Pcsclite-cvs-commit mailing list