summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-01-17 08:10:43 +0000
committerru <ru@FreeBSD.org>2003-01-17 08:10:43 +0000
commit4a0e0ebdff91408a9e8a3164f2c5807edff36d4b (patch)
treec9de3d5193370636ce9402fef212291e499190bc /usr.sbin
parentdef7e1bda051583fcc3525070ac5429f314f7fcf (diff)
downloadFreeBSD-src-4a0e0ebdff91408a9e8a3164f2c5807edff36d4b.zip
FreeBSD-src-4a0e0ebdff91408a9e8a3164f2c5807edff36d4b.tar.gz
Don't hide global `s'.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/arp/arp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index b052762..d9509ae 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -220,7 +220,7 @@ file(char *name)
{
FILE *fp;
int i, retval;
- char line[100], arg[5][50], *args[5], *s;
+ char line[100], arg[5][50], *args[5], *p;
if ((fp = fopen(name, "r")) == NULL)
errx(1, "cannot open %s", name);
@@ -231,12 +231,12 @@ file(char *name)
args[4] = &arg[4][0];
retval = 0;
while(fgets(line, 100, fp) != NULL) {
- if ((s = strchr(line, '#')) != NULL)
- *s = '\0';
- for (s = line; isblank(*s); s++);
- if (*s == '\0')
+ if ((p = strchr(line, '#')) != NULL)
+ *p = '\0';
+ for (p = line; isblank(*p); p++);
+ if (*p == '\0')
continue;
- i = sscanf(s, "%49s %49s %49s %49s %49s", arg[0], arg[1],
+ i = sscanf(p, "%49s %49s %49s %49s %49s", arg[0], arg[1],
arg[2], arg[3], arg[4]);
if (i < 2) {
warnx("bad line: %s", line);
OpenPOWER on IntegriCloud