[Pcsclite-cvs-commit] r2307 - trunk/PCSC/src

Ludovic Rousseau rousseau at alioth.debian.org
Sat Jan 6 21:21:48 CET 2007


Author: rousseau
Date: 2007-01-06 21:21:47 +0100 (Sat, 06 Jan 2007)
New Revision: 2307

Modified:
   trunk/PCSC/src/readerfactory.c
Log:
use f1 instead of f to avoid:
warning: declaration of ?\226?\128?\152f?\226?\128?\153 shadows a previous local


Modified: trunk/PCSC/src/readerfactory.c
===================================================================
--- trunk/PCSC/src/readerfactory.c	2007-01-06 19:01:26 UTC (rev 2306)
+++ trunk/PCSC/src/readerfactory.c	2007-01-06 20:21:47 UTC (rev 2307)
@@ -887,12 +887,12 @@
 
 #define GET_ADDRESS_OPTIONALv1(field, function, code) \
 { \
-	void *f = NULL; \
-	if (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f, "IFD_" #function)) \
+	void *f1 = NULL; \
+	if (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f1, "IFD_" #function)) \
 	{ \
 		code \
 	} \
-	rContext->psFunctions.psFunctions_v1.pvf ## field = f; \
+	rContext->psFunctions.psFunctions_v1.pvf ## field = f1; \
 }
 
 #define GET_ADDRESSv1(field, function) \
@@ -927,12 +927,12 @@
 
 #define GET_ADDRESS_OPTIONALv2(s, code) \
 { \
-	void *f = NULL; \
-	if (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f, "IFDH" #s)) \
+	void *f1 = NULL; \
+	if (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f1, "IFDH" #s)) \
 	{ \
 		code \
 	} \
-	rContext->psFunctions.psFunctions_v2.pvf ## s = f; \
+	rContext->psFunctions.psFunctions_v2.pvf ## s = f1; \
 }
 
 #define GET_ADDRESSv2(s) \
@@ -961,12 +961,12 @@
 
 #define GET_ADDRESS_OPTIONALv3(s, code) \
 { \
-	void *f = NULL; \
-	if (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f, "IFDH" #s)) \
+	void *f1 = NULL; \
+	if (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f1, "IFDH" #s)) \
 	{ \
 		code \
 	} \
-	rContext->psFunctions.psFunctions_v3.pvf ## s = f; \
+	rContext->psFunctions.psFunctions_v3.pvf ## s = f1; \
 }
 
 #define GET_ADDRESSv3(s) \




More information about the Pcsclite-cvs-commit mailing list