iphlpapi: Avoid shadowing parameters
André Hentschel
nerv at dawncrow.de
Sun Apr 15 06:22:06 CDT 2012
---
dlls/iphlpapi/ipstats.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c
index db475fb..3c793e2 100644
--- a/dlls/iphlpapi/ipstats.c
+++ b/dlls/iphlpapi/ipstats.c
@@ -1016,7 +1016,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw
if ((fp = fopen("/proc/net/route", "r")))
{
char buf[512], *ptr;
- DWORD flags;
+ DWORD lflags;
/* skip header line */
ptr = fgets(buf, sizeof(buf), fp);
@@ -1031,10 +1031,10 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw
row.dwForwardDest = strtoul(ptr, &ptr, 16);
row.dwForwardNextHop = strtoul(ptr + 1, &ptr, 16);
- flags = strtoul(ptr + 1, &ptr, 16);
+ lflags = strtoul(ptr + 1, &ptr, 16);
- if (!(flags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID;
- else if (flags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT;
+ if (!(lflags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID;
+ else if (lflags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT;
else row.u1.ForwardType = MIB_IPROUTE_TYPE_DIRECT;
strtoul(ptr + 1, &ptr, 16); /* refcount, skip */
@@ -1045,7 +1045,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw
* route is typically set with MIB_IPPROTO_NETMGMT instead */
row.u2.ForwardProto = MIB_IPPROTO_LOCAL;
- if (!(table = append_ipforward_row( heap, flags, table, &count, &row )))
+ if (!(table = append_ipforward_row( heap, lflags, table, &count, &row )))
break;
}
fclose(fp);
@@ -1275,7 +1275,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO
if ((fp = fopen("/proc/net/arp", "r")))
{
char buf[512], *ptr;
- DWORD flags;
+ DWORD lflags;
/* skip header line */
ptr = fgets(buf, sizeof(buf), fp);
@@ -1286,14 +1286,14 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO
row.dwAddr = inet_addr(ptr);
while (*ptr && !isspace(*ptr)) ptr++;
strtoul(ptr + 1, &ptr, 16); /* hw type (skip) */
- flags = strtoul(ptr + 1, &ptr, 16);
+ lflags = strtoul(ptr + 1, &ptr, 16);
#ifdef ATF_COM
- if (flags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC;
+ if (lflags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC;
else
#endif
#ifdef ATF_PERM
- if (flags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC;
+ if (lflags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC;
else
#endif
row.u.Type = MIB_IPNET_TYPE_OTHER;
@@ -1309,7 +1309,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO
while (*ptr && isspace(*ptr)) ptr++;
getInterfaceIndexByName(ptr, &row.dwIndex);
- if (!(table = append_ipnet_row( heap, flags, table, &count, &row )))
+ if (!(table = append_ipnet_row( heap, lflags, table, &count, &row )))
break;
}
fclose(fp);
--
Best Regards, André Hentschel
More information about the wine-patches
mailing list