[Pcsclite-cvs-commit] r5178 - /trunk/PCSC/src/readerfactory.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Mon Aug 23 09:49:42 UTC 2010
Author: rousseau
Date: Mon Aug 23 09:49:41 2010
New Revision: 5178
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5178
Log:
RFBindFunctions(): rename rv in rvl to avoid warnings
warning: declaration of ‘rv’ shadows a previous local
Also change type from DWORD to int since DYN_GetAddress() returns an int
Modified:
trunk/PCSC/src/readerfactory.c
Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=5178&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Mon Aug 23 09:49:41 2010
@@ -759,8 +759,8 @@
#define GET_ADDRESS_OPTIONALv1(field, function, code) \
{ \
void *f1 = NULL; \
- DWORD rv = DYN_GetAddress(rContext->vHandle, &f1, "IFD_" #function); \
- if (SCARD_S_SUCCESS != rv) \
+ int rvl = DYN_GetAddress(rContext->vHandle, &f1, "IFD_" #function); \
+ if (SCARD_S_SUCCESS != rvl) \
{ \
code \
} \
@@ -797,8 +797,8 @@
#define GET_ADDRESS_OPTIONALv2(s, code) \
{ \
void *f1 = NULL; \
- DWORD rv = DYN_GetAddress(rContext->vHandle, &f1, "IFDH" #s); \
- if (SCARD_S_SUCCESS != rv) \
+ int rvl = DYN_GetAddress(rContext->vHandle, &f1, "IFDH" #s); \
+ if (SCARD_S_SUCCESS != rvl) \
{ \
code \
} \
@@ -829,8 +829,8 @@
#define GET_ADDRESS_OPTIONALv3(s, code) \
{ \
void *f1 = NULL; \
- DWORD rv = DYN_GetAddress(rContext->vHandle, &f1, "IFDH" #s); \
- if (SCARD_S_SUCCESS != rv) \
+ int rvl = DYN_GetAddress(rContext->vHandle, &f1, "IFDH" #s); \
+ if (SCARD_S_SUCCESS != rvl) \
{ \
code \
} \
More information about the Pcsclite-cvs-commit
mailing list