[Pcsclite-cvs-commit] r5864 - /trunk/PCSC/src/winscard_svc.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sat Jul  9 11:37:48 2011
New Revision: 5864

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5864
Log:
Fix compiler warnings

winscard_svc.c: In function `contextsListhContext_seeker':
winscard_svc.c:86:3: warning: format `%X' expects argument of type
`unsigned int', but argument 6 has type `const void *' [-Wformat]
winscard_svc.c:86:3: warning: format `%X' expects argument of type
`unsigned int', but argument 7 has type `const void *' [-Wformat]

winscard_svc.c: In function `ContextThread':
winscard_svc.c:296:2: warning: format `%X' expects argument of type
`unsigned int', but argument 7 has type `struct SCONTEXT *' [-Wformat]

winscard_svc.c: In function `MSGAddHandle':
winscard_svc.c:836:4: warning: format `%X' expects argument of type
`unsigned int', but argument 6 has type `struct SCONTEXT *' [-Wformat]

winscard_svc.c: In function `MSGCleanupClient':
winscard_svc.c:916:2: warning: format `%X' expects argument of type
`unsigned int', but argument 7 has type `struct SCONTEXT *' [-Wformat]
winscard_svc.c:924:2: warning: format `%X' expects argument of type
`unsigned int', but argument 6 has type `struct SCONTEXT *' [-Wformat]

Modified:
    trunk/PCSC/src/winscard_svc.c

Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=5864&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Sat Jul  9 11:37:48 2011
@@ -83,7 +83,7 @@
 
 	if ((el == NULL) || (key == NULL))
 	{
-		Log3(PCSC_LOG_CRITICAL, "called with NULL pointer: el=%X, key=%X",
+		Log3(PCSC_LOG_CRITICAL, "called with NULL pointer: el=%p, key=%p",
 			el, key);
 		return 0;
 	}
@@ -293,7 +293,7 @@
 	SCONTEXT * threadContext = (SCONTEXT *) newContext;
 	int32_t filedes = threadContext->dwClientID;
 
-	Log3(PCSC_LOG_DEBUG, "Thread is started: dwClientID=%d, threadContext @%X",
+	Log3(PCSC_LOG_DEBUG, "Thread is started: dwClientID=%d, threadContext @%p",
 		threadContext->dwClientID, threadContext);
 
 	while (1)
@@ -834,7 +834,7 @@
 		if (listLength >= contextMaxCardHandles)
 		{
 			Log4(PCSC_LOG_DEBUG,
-				"Too many card handles for thread context @%X: %d (max is %d)"
+				"Too many card handles for thread context @%p: %d (max is %d)"
 				"Restart pcscd with --max-card-handle-per-thread value",
 				threadContext, listLength, contextMaxCardHandles);
 			return SCARD_E_NO_MEMORY;
@@ -914,14 +914,14 @@
 	}
 
 	Log3(PCSC_LOG_DEBUG,
-		"Thread is stopping: dwClientID=%d, threadContext @%X",
+		"Thread is stopping: dwClientID=%d, threadContext @%p",
 		threadContext->dwClientID, threadContext);
 
 	/* Clear the struct to ensure that we detect
 	 * access to de-allocated memory
 	 * Hopefully the compiler won't optimise it out */
 	memset((void*) threadContext, 0, sizeof(SCONTEXT));
-	Log2(PCSC_LOG_DEBUG, "Freeing SCONTEXT @%X", threadContext);
+	Log2(PCSC_LOG_DEBUG, "Freeing SCONTEXT @%p", threadContext);
 
 	(void)pthread_mutex_lock(&contextsList_lock);
 	lrv = list_delete(&contextsList, threadContext);