mirror of
git://source.winehq.org/git/wine.git
synced 2024-07-21 09:14:10 +00:00
iphlpapi: Rename local variables shadowing the flags parameters.
Signed-off-by: Jiangyi Chen <chenjiangyi@uniontech.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
d6c4efec1a
commit
f6ae4d1670
|
@ -1402,7 +1402,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw
|
||||||
if ((fp = fopen("/proc/net/route", "r")))
|
if ((fp = fopen("/proc/net/route", "r")))
|
||||||
{
|
{
|
||||||
char buf[512], *ptr;
|
char buf[512], *ptr;
|
||||||
DWORD flags;
|
DWORD rtf_flags;
|
||||||
|
|
||||||
/* skip header line */
|
/* skip header line */
|
||||||
ptr = fgets(buf, sizeof(buf), fp);
|
ptr = fgets(buf, sizeof(buf), fp);
|
||||||
|
@ -1417,10 +1417,10 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw
|
||||||
|
|
||||||
row.dwForwardDest = strtoul(ptr, &ptr, 16);
|
row.dwForwardDest = strtoul(ptr, &ptr, 16);
|
||||||
row.dwForwardNextHop = strtoul(ptr + 1, &ptr, 16);
|
row.dwForwardNextHop = strtoul(ptr + 1, &ptr, 16);
|
||||||
flags = strtoul(ptr + 1, &ptr, 16);
|
rtf_flags = strtoul(ptr + 1, &ptr, 16);
|
||||||
|
|
||||||
if (!(flags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID;
|
if (!(rtf_flags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID;
|
||||||
else if (flags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT;
|
else if (rtf_flags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT;
|
||||||
else row.u1.ForwardType = MIB_IPROUTE_TYPE_DIRECT;
|
else row.u1.ForwardType = MIB_IPROUTE_TYPE_DIRECT;
|
||||||
|
|
||||||
strtoul(ptr + 1, &ptr, 16); /* refcount, skip */
|
strtoul(ptr + 1, &ptr, 16); /* refcount, skip */
|
||||||
|
@ -1664,7 +1664,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO
|
||||||
if ((fp = fopen("/proc/net/arp", "r")))
|
if ((fp = fopen("/proc/net/arp", "r")))
|
||||||
{
|
{
|
||||||
char buf[512], *ptr;
|
char buf[512], *ptr;
|
||||||
DWORD flags;
|
DWORD atf_flags;
|
||||||
|
|
||||||
/* skip header line */
|
/* skip header line */
|
||||||
ptr = fgets(buf, sizeof(buf), fp);
|
ptr = fgets(buf, sizeof(buf), fp);
|
||||||
|
@ -1675,14 +1675,14 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO
|
||||||
row.dwAddr = inet_addr(ptr);
|
row.dwAddr = inet_addr(ptr);
|
||||||
while (*ptr && !isspace(*ptr)) ptr++;
|
while (*ptr && !isspace(*ptr)) ptr++;
|
||||||
strtoul(ptr + 1, &ptr, 16); /* hw type (skip) */
|
strtoul(ptr + 1, &ptr, 16); /* hw type (skip) */
|
||||||
flags = strtoul(ptr + 1, &ptr, 16);
|
atf_flags = strtoul(ptr + 1, &ptr, 16);
|
||||||
|
|
||||||
#ifdef ATF_COM
|
#ifdef ATF_COM
|
||||||
if (flags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC;
|
if (atf_flags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
#ifdef ATF_PERM
|
#ifdef ATF_PERM
|
||||||
if (flags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC;
|
if (atf_flags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
row.u.Type = MIB_IPNET_TYPE_OTHER;
|
row.u.Type = MIB_IPNET_TYPE_OTHER;
|
||||||
|
|
Loading…
Reference in a new issue