[Pcsclite-cvs-commit] r4527 - in /trunk/PCSC/src: readerfactory.h thread_generic.h thread_unix.c winscard_clnt.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Oct 28 16:44:28 2009
New Revision: 4527

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4527
Log:
remove the type PCSCLITE_MUTEX_T and use an explicit pointer type
(PCSCLITE_MUTEX *) instead

This should avoid bugs like the one corrected in revision 4525

Modified:
    trunk/PCSC/src/readerfactory.h
    trunk/PCSC/src/thread_generic.h
    trunk/PCSC/src/thread_unix.c
    trunk/PCSC/src/winscard_clnt.c

Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=4527&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Wed Oct 28 16:44:28 2009
@@ -109,7 +109,7 @@
 		char lpcDevice[MAX_DEVICENAME];	/**< Device Name */
 		PCSCLITE_THREAD_T pthThread;	/**< Event polling thread */
 		RESPONSECODE (*pthCardEvent)(DWORD);	/**< Card Event sync */
-		PCSCLITE_MUTEX_T mMutex;	/**< Mutex for this connection */
+		PCSCLITE_MUTEX *mMutex;	/**< Mutex for this connection */
 		RDR_CLIHANDLES psHandles[PCSCLITE_MAX_READER_CONTEXT_CHANNELS];
                                          /**< Structure of connected handles */
 		union

Modified: trunk/PCSC/src/thread_generic.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/thread_generic.h?rev=4527&op=diff
==============================================================================
--- trunk/PCSC/src/thread_generic.h (original)
+++ trunk/PCSC/src/thread_generic.h Wed Oct 28 16:44:28 2009
@@ -27,18 +27,17 @@
 
 #define PCSCLITE_THREAD_T                pthread_t
 #define PCSCLITE_MUTEX                   pthread_mutex_t
-#define PCSCLITE_MUTEX_T                 pthread_mutex_t*
 #define PCSCLITE_THREAD_FUNCTION(f)      void *(*f)(void *)
 
 /* thread attributes */
 #define THREAD_ATTR_DEFAULT			0
 #define THREAD_ATTR_DETACHED		1
 
-	int SYS_MutexInit(PCSCLITE_MUTEX_T);
-	int SYS_MutexDestroy(PCSCLITE_MUTEX_T);
-	int SYS_MutexLock(PCSCLITE_MUTEX_T);
-	int SYS_MutexTryLock(PCSCLITE_MUTEX_T);
-	int SYS_MutexUnLock(PCSCLITE_MUTEX_T);
+	int SYS_MutexInit(PCSCLITE_MUTEX *);
+	int SYS_MutexDestroy(PCSCLITE_MUTEX *);
+	int SYS_MutexLock(PCSCLITE_MUTEX *);
+	int SYS_MutexTryLock(PCSCLITE_MUTEX *);
+	int SYS_MutexUnLock(PCSCLITE_MUTEX *);
 	int SYS_ThreadCreate(PCSCLITE_THREAD_T *, int, PCSCLITE_THREAD_FUNCTION( ),
 		/*@null@*/ LPVOID);
 	int SYS_ThreadCancel(PCSCLITE_THREAD_T);

Modified: trunk/PCSC/src/thread_unix.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/thread_unix.c?rev=4527&op=diff
==============================================================================
--- trunk/PCSC/src/thread_unix.c (original)
+++ trunk/PCSC/src/thread_unix.c Wed Oct 28 16:44:28 2009
@@ -20,7 +20,7 @@
 #include "thread_generic.h"
 #include "misc.h"
 
-INTERNAL int SYS_MutexInit(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexInit(PCSCLITE_MUTEX * mMutex)
 {
 	if (mMutex)
 		return pthread_mutex_init(mMutex, NULL);
@@ -28,7 +28,7 @@
 		return -1;
 }
 
-INTERNAL int SYS_MutexDestroy(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexDestroy(PCSCLITE_MUTEX * mMutex)
 {
 	if (mMutex)
 		return pthread_mutex_destroy(mMutex);
@@ -36,7 +36,7 @@
 		return -1;
 }
 
-INTERNAL int SYS_MutexLock(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexLock(PCSCLITE_MUTEX * mMutex)
 {
 	if (mMutex)
 		return pthread_mutex_lock(mMutex);
@@ -44,7 +44,7 @@
 		return -1;
 }
 
-INTERNAL int SYS_MutexTryLock(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexTryLock(PCSCLITE_MUTEX * mMutex)
 {
 	if (mMutex)
 		return pthread_mutex_trylock(mMutex);
@@ -52,7 +52,7 @@
 		return -1;
 }
 
-INTERNAL int SYS_MutexUnLock(PCSCLITE_MUTEX_T mMutex)
+INTERNAL int SYS_MutexUnLock(PCSCLITE_MUTEX * mMutex)
 {
 	if (mMutex)
 		return pthread_mutex_unlock(mMutex);

Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=4527&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Wed Oct 28 16:44:28 2009
@@ -193,7 +193,7 @@
 {
 	DWORD dwClientID;				/**< Client Connection ID */
 	SCARDCONTEXT hContext;			/**< Application Context ID */
-	PCSCLITE_MUTEX_T mMutex;		/**< Mutex for this context */
+	PCSCLITE_MUTEX * mMutex;		/**< Mutex for this context */
 	CHANNEL_MAP psChannelMap[PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS];
 } psContextMap[PCSCLITE_MAX_APPLICATION_CONTEXTS];