mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-29 16:44:03 +00:00
Code Issues Releases Activity

- Determine the size of buffers with sizeof() instead of using

Browse Source 
plain magic numbers - one of them was apparently wrong but unharmful.
 - Remove empty line.
This commit is contained in:
Robert Drehmel 2003-02-10 16:58:47 +00:00
parent 1ecc8ba383
commit ec3b72e932
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=110651
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/netstat/if.c
View File

@ -233,9 +233,10 @@ intpr(int _interval, u_long ifnetaddr, void (*pfunc)(char *))
if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet) ||
kread((u_long)ifnet.if_name, tname, 16))
return;
tname[15] = '\0';
tname[sizeof(tname) - 1] = '\0';
ifnetaddr = (u_long)TAILQ_NEXT(&ifnet, if_link);
snprintf(name, 32, "%s%d", tname, ifnet.if_unit);
snprintf(name, sizeof(name), "%s%d", tname,
ifnet.if_unit);
if (interface != 0 && (strcmp(name, interface) != 0))
continue;
cp = index(name, '\0');
@ -542,15 +543,15 @@ sidewaysintpr(unsigned interval1, u_long off)
if (kread(off, (char *)&ifnet, sizeof ifnet))
break;
if (kread((u_long)ifnet.if_name, tname, 16))
if (kread((u_long)ifnet.if_name, tname, sizeof(tname)))
break;
tname[15] = '\0';
snprintf(name, 16, "%s%d", tname, ifnet.if_unit);
tname[sizeof(tname) - 1] = '\0';
snprintf(name, sizeof(name), "%s%d", tname, ifnet.if_unit);
if (interface && strcmp(name, interface) == 0) {
interesting = ip;
interesting_off = off;
}
snprintf(ip->ift_name, 16, "(%s)", name);;
snprintf(ip->ift_name, sizeof(ip->ift_name), "(%s)", name);;
if ((ipn = malloc(sizeof(struct iftot))) == NULL) {
printf("malloc failed\n");
exit(1);
@ -571,7 +572,6 @@ sidewaysintpr(unsigned interval1, u_long off)
}
memset(sum, 0, sizeof(struct iftot));
(void)signal(SIGALRM, catchalarm);
signalled = NO;
(void)alarm(interval1);