summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2006-11-27 19:50:50 +0000
committeryar <yar@FreeBSD.org>2006-11-27 19:50:50 +0000
commit97045cf6d0d5b678401de5177dd72825261fe07d (patch)
tree8e110c68de405a4d9a8e90b61a1baa610310290f /usr.bin
parentac0fbebe4ae682809c5875a529e92667006f0faa (diff)
downloadFreeBSD-src-97045cf6d0d5b678401de5177dd72825261fe07d.zip
FreeBSD-src-97045cf6d0d5b678401de5177dd72825261fe07d.tar.gz
Don't shadow globals.
Found by: WARNS=6 MFC after: 3 days
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/netstat/bpf.c4
-rw-r--r--usr.bin/netstat/ipsec.c8
-rw-r--r--usr.bin/netstat/pfkey.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index 9546ac0..f5cda6a 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -83,7 +83,7 @@ bpf_flags(struct xbpf_d *bd, char *flagbuf)
}
void
-bpf_stats(char *interface)
+bpf_stats(char *ifname)
{
struct xbpf_d *d, *bd;
char *pname, flagbuf[12];
@@ -111,7 +111,7 @@ bpf_stats(char *interface)
"Pid", "Netif", "Flags", "Recv", "Drop", "Match", "Sblen",
"Hblen", "Command");
for (d = &bd[0]; d < &bd[size / sizeof(*d)]; d++) {
- if (interface && strcmp(interface, d->bd_ifname) != 0)
+ if (ifname && strcmp(ifname, d->bd_ifname) != 0)
continue;
bpf_flags(d, flagbuf);
pname = bpf_pidname(d->bd_pid);
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index 63bdd52..125be12 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -335,7 +335,7 @@ print_newipsecstats(const struct newipsecstat *newipsecstat)
}
void
-ipsec_stats_new(u_long off, const char *name, int af __unused)
+ipsec_stats_new(u_long off, const char *name, int family __unused)
{
struct newipsecstat newipsecstat;
@@ -384,7 +384,7 @@ print_ahstats(const struct ahstat *ahstat)
}
void
-ah_stats(u_long off, const char *name, int af __unused)
+ah_stats(u_long off, const char *name, int family __unused)
{
struct ahstat ahstat;
@@ -434,7 +434,7 @@ print_espstats(const struct espstat *espstat)
}
void
-esp_stats(u_long off, const char *name, int af __unused)
+esp_stats(u_long off, const char *name, int family __unused)
{
struct espstat espstat;
@@ -479,7 +479,7 @@ print_ipcompstats(const struct ipcompstat *ipcompstat)
}
void
-ipcomp_stats(u_long off, const char *name, int af __unused)
+ipcomp_stats(u_long off, const char *name, int family __unused)
{
struct ipcompstat ipcompstat;
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 377ff17..ed2c00c 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -120,7 +120,7 @@ pfkey_msgtype_names(int x)
}
void
-pfkey_stats(u_long off, const char *name, int af __unused)
+pfkey_stats(u_long off, const char *name, int family __unused)
{
struct pfkeystat pfkeystat;
unsigned first, type;
OpenPOWER on IntegriCloud