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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jun 14 15:17:53 2011
New Revision: 5790

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5790
Log:
API_TRACE_IN: use %ld instead of %d for DWORD and LONG types.

The timeout in SCardGetStatusChange() is now correctly displayed
4294967295 instead of -1 on 64-bits systems.

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=5790&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Tue Jun 14 15:17:53 2011
@@ -857,7 +857,7 @@
 	SCONTEXTMAP * currentContextMap;
 
 	PROFILE_START
-	API_TRACE_IN("%d %s %d %d", hContext, szReader, dwShareMode, dwPreferredProtocols)
+	API_TRACE_IN("%ld %s %ld %ld", hContext, szReader, dwShareMode, dwPreferredProtocols)
 
 	/*
 	 * Check for NULL parameters
@@ -1131,7 +1131,7 @@
 	CHANNEL_MAP * pChannelMap;
 
 	PROFILE_START
-	API_TRACE_IN("%d %d", hCard, dwDisposition)
+	API_TRACE_IN("%ld %ld", hCard, dwDisposition)
 
 	CHECK_SAME_PROCESS
 
@@ -1799,11 +1799,11 @@
 	LONG rv = SCARD_S_SUCCESS;
 
 	PROFILE_START
-	API_TRACE_IN("%d %d %d", hContext, dwTimeout, cReaders)
+	API_TRACE_IN("%ld %ld %d", hContext, dwTimeout, cReaders)
 #ifdef DO_TRACE
 	for (j=0; j<cReaders; j++)
 	{
-		API_TRACE_IN("[%d] %s %X %X", j, rgReaderStates[j].szReader,
+		API_TRACE_IN("[%d] %s %lX %lX", j, rgReaderStates[j].szReader,
 			rgReaderStates[j].dwCurrentState, rgReaderStates[j].dwEventState)
 	}
 #endif
@@ -3252,7 +3252,7 @@
 	struct cancel_struct scCancelStruct;
 
 	PROFILE_START
-	API_TRACE_IN("%d", hContext)
+	API_TRACE_IN("%ld", hContext)
 
 	/*
 	 * Make sure this context has been opened