[Pcsclite-cvs-commit] r5863 - /trunk/PCSC/src/winscard.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Sat Jul 9 11:35:41 UTC 2011


Author: rousseau
Date: Sat Jul  9 11:35:41 2011
New Revision: 5863

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

winscard.c: In function `SCardEstablishContext':
winscard.c:193:2: warning: format `%X' expects argument of type
`unsigned int', but argument 6 has type `SCARDCONTEXT' [-Wformat]

winscard.c: In function `SCardReleaseContext':
winscard.c:204:2: warning: format `%X' expects argument of type
`unsigned int', but argument 6 has type `SCARDCONTEXT' [-Wformat]

winscard.c: In function `SCardConnect':
winscard.c:234:2: warning: format `%d' expects argument of type `int',
but argument 7 has type `DWORD' [-Wformat]
winscard.c:315:5: warning: format `%d' expects argument of type `int',
but argument 6 has type `LONG' [-Wformat]
winscard.c:315:5: warning: format `%X' expects argument of type
`unsigned int', but argument 7 has type `LONG' [-Wformat]
winscard.c:410:5: warning: format `%d' expects argument of type `int',
but argument 6 has type `DWORD' [-Wformat]
winscard.c:422:2: warning: format `%x' expects argument of type
`unsigned int', but argument 6 has type `SCARDHANDLE' [-Wformat]

winscard.c: In function `SCardReconnect':
winscard.c:693:5: warning: format `%d' expects argument of type `int',
but argument 6 has type `DWORD' [-Wformat]

winscard.c: In function `SCardDisconnect':
winscard.c:821:2: warning: format `%d' expects argument of type `int',
but argument 6 has type `DWORD' [-Wformat]

winscard.c: In function `SCardBeginTransaction':
winscard.c:1051:2: warning: format `%X' expects argument of type
`unsigned int', but argument 6 has type `LONG' [-Wformat]

winscard.c: In function `SCardEndTransaction':
winscard.c:1188:2: warning: format `%X' expects argument of type
`unsigned int', but argument 6 has type `LONG' [-Wformat]

winscard.c: In function `SCardTransmit':
winscard.c:1539:2: warning: format `%d' expects argument of type `int',
but argument 6 has type `DWORD' [-Wformat]

Modified:
    trunk/PCSC/src/winscard.c

Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=5863&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Sat Jul  9 11:35:41 2011
@@ -190,7 +190,7 @@
 
 	*phContext = (PCSCLITE_SVC_IDENTITY + SYS_RandomInt(1, 65535));
 
-	Log2(PCSC_LOG_DEBUG, "Establishing Context: 0x%X", *phContext);
+	Log2(PCSC_LOG_DEBUG, "Establishing Context: 0x%lX", *phContext);
 
 	return SCARD_S_SUCCESS;
 }
@@ -201,7 +201,7 @@
 	 * Nothing to do here RPC layer will handle this
 	 */
 
-	Log2(PCSC_LOG_DEBUG, "Releasing Context: 0x%X", hContext);
+	Log2(PCSC_LOG_DEBUG, "Releasing Context: 0x%lX", hContext);
 
 	return SCARD_S_SUCCESS;
 }
@@ -231,7 +231,7 @@
 			dwShareMode != SCARD_SHARE_DIRECT)
 		return SCARD_E_INVALID_VALUE;
 
-	Log3(PCSC_LOG_DEBUG, "Attempting Connect to %s using protocol: %d",
+	Log3(PCSC_LOG_DEBUG, "Attempting Connect to %s using protocol: %ld",
 		szReader, dwPreferredProtocols);
 
 	rv = RFReaderInfo((LPSTR) szReader, &rContext);
@@ -312,7 +312,7 @@
 					rContext->readerState->cardAtrLength);
 			}
 			else
-				Log3(PCSC_LOG_ERROR, "Error powering up card: %d 0x%04X",
+				Log3(PCSC_LOG_ERROR, "Error powering up card: %ld 0x%04lX",
 					rv, rv);
 		}
 
@@ -407,7 +407,7 @@
 				break;
 
 			default:
-				Log2(PCSC_LOG_ERROR, "Active Protocol: unknown %d",
+				Log2(PCSC_LOG_ERROR, "Active Protocol: unknown %ld",
 					*pdwActiveProtocol);
 		}
 	}
@@ -419,7 +419,7 @@
 	 */
 	*phCard = RFCreateReaderHandle(rContext);
 
-	Log2(PCSC_LOG_DEBUG, "hCard Identity: %x", *phCard);
+	Log2(PCSC_LOG_DEBUG, "hCard Identity: %lx", *phCard);
 
 	/*******************************************
 	 *
@@ -690,7 +690,7 @@
 				break;
 
 			default:
-				Log2(PCSC_LOG_ERROR, "Active Protocol: unknown %d",
+				Log2(PCSC_LOG_ERROR, "Active Protocol: unknown %ld",
 					*pdwActiveProtocol);
 		}
 	}
@@ -818,7 +818,7 @@
 	}
 
 	Log2(PCSC_LOG_DEBUG, "Active Contexts: %d", rContext->contexts);
-	Log2(PCSC_LOG_DEBUG, "dwDisposition: %d", dwDisposition);
+	Log2(PCSC_LOG_DEBUG, "dwDisposition: %ld", dwDisposition);
 
 	if (dwDisposition == SCARD_RESET_CARD ||
 		dwDisposition == SCARD_UNPOWER_CARD)
@@ -1048,7 +1048,7 @@
 	if (SCARD_E_SHARING_VIOLATION == rv)
 		(void)SYS_USleep(PCSCLITE_LOCK_POLL_RATE);
 
-	Log2(PCSC_LOG_DEBUG, "Status: 0x%08X", rv);
+	Log2(PCSC_LOG_DEBUG, "Status: 0x%08lX", rv);
 
 	return rv;
 }
@@ -1185,7 +1185,7 @@
 	 */
 	(void)RFUnlockSharing(hCard, rContext);
 
-	Log2(PCSC_LOG_DEBUG, "Status: 0x%08X", rv);
+	Log2(PCSC_LOG_DEBUG, "Status: 0x%08lX", rv);
 
 	return rv;
 }
@@ -1536,7 +1536,7 @@
 	sRecvPci.Length = pioRecvPci->cbPciLength;
 
 	/* the protocol number is decoded a few lines above */
-	Log2(PCSC_LOG_DEBUG, "Send Protocol: T=%d", sSendPci.Protocol);
+	Log2(PCSC_LOG_DEBUG, "Send Protocol: T=%ld", sSendPci.Protocol);
 
 	tempRxLength = dwRxLength;
 




More information about the Pcsclite-cvs-commit mailing list