[Pcsclite-cvs-commit] r5858 - /trunk/PCSC/src/winscard_clnt.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sat Jul  9 11:18:32 2011
New Revision: 5858

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

winscard_clnt.c: In function 'CHANNEL_MAP_seeker':
winscard_clnt.c:282: warning: format '%X' expects type 'unsigned int',
but argument 6 has type 'const void *'
winscard_clnt.c:282: warning: format '%X' expects type 'unsigned int',
but argument 7 has type 'const void *'
winscard_clnt.c: In function 'SCONTEXTMAP_seeker':
winscard_clnt.c:317: warning: format '%X' expects type 'unsigned int',
but argument 6 has type 'const void *'
winscard_clnt.c:317: warning: format '%X' expects type 'unsigned int',
but argument 7 has type 'const void *'
winscard_clnt.c: In function 'SCardAddContext':
winscard_clnt.c:3385: warning: format '%X' expects type 'unsigned int',
but argument 6 has type 'struct SCONTEXTMAP *'
winscard_clnt.c:3393: warning: format '%X' expects type 'unsigned int',
but argument 6 has type 'struct SCONTEXTMAP *'

Modified:
    trunk/PCSC/src/winscard_clnt.c

Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=5858&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Sat Jul  9 11:18:32 2011
@@ -280,7 +280,7 @@
 	if ((el == NULL) || (key == NULL))
 	{
 		Log3(PCSC_LOG_CRITICAL,
-			"CHANNEL_MAP_seeker called with NULL pointer: el=%X, key=%X",
+			"CHANNEL_MAP_seeker called with NULL pointer: el=%p, key=%p",
 			el, key);
 		return 0;
 	}
@@ -315,7 +315,7 @@
 	if ((el == NULL) || (key == NULL))
 	{
 		Log3(PCSC_LOG_CRITICAL,
-			"SCONTEXTMAP_seeker called with NULL pointer: el=%X, key=%X",
+			"SCONTEXTMAP_seeker called with NULL pointer: el=%p, key=%p",
 			el, key);
 		return 0;
 	}
@@ -3382,7 +3382,7 @@
 	if (NULL == newContextMap)
 		return SCARD_E_NO_MEMORY;
 
-	Log2(PCSC_LOG_DEBUG, "Allocating new SCONTEXTMAP @%X", newContextMap);
+	Log2(PCSC_LOG_DEBUG, "Allocating new SCONTEXTMAP @%p", newContextMap);
 	newContextMap->hContext = hContext;
 	newContextMap->dwClientID = dwClientID;
 	newContextMap->cancellable = FALSE;
@@ -3390,7 +3390,7 @@
 	newContextMap->mMutex = malloc(sizeof(pthread_mutex_t));
 	if (NULL == newContextMap->mMutex)
 	{
-		Log2(PCSC_LOG_DEBUG, "Freeing SCONTEXTMAP @%X", newContextMap);
+		Log2(PCSC_LOG_DEBUG, "Freeing SCONTEXTMAP @%p", newContextMap);
 		free(newContextMap);
 		return SCARD_E_NO_MEMORY;
 	}