diff options
author | ngie <ngie@FreeBSD.org> | 2017-01-13 08:40:53 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-01-13 08:40:53 +0000 |
commit | fe36d66c39ab4f4449c4279aaaf0c85ba147ad5a (patch) | |
tree | 2c7bb65a543466983ddcc43f6538cbab3e81c5fe /usr.sbin/rwhod/rwhod.c | |
parent | 6e4d1572955308508af37e261c77dc3ddfbac38c (diff) | |
download | FreeBSD-src-fe36d66c39ab4f4449c4279aaaf0c85ba147ad5a.zip FreeBSD-src-fe36d66c39ab4f4449c4279aaaf0c85ba147ad5a.tar.gz |
MFC r311709:
Style(9) fixes
- Sort sys/ #includes
- Use nitems instead of hardcoding the length of `mib`
Diffstat (limited to 'usr.sbin/rwhod/rwhod.c')
-rw-r--r-- | usr.sbin/rwhod/rwhod.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index ed45fe9..9a9dad8 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -43,14 +43,14 @@ static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capsicum.h> #include <sys/param.h> +#include <sys/capsicum.h> +#include <sys/ioctl.h> +#include <sys/procdesc.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/signal.h> -#include <sys/ioctl.h> #include <sys/sysctl.h> -#include <sys/procdesc.h> #include <sys/wait.h> #include <net/if.h> @@ -548,7 +548,7 @@ getboottime(int signo __unused) mib[0] = CTL_KERN; mib[1] = KERN_BOOTTIME; size = sizeof(tm); - if (sysctl(mib, 2, &tm, &size, NULL, 0) == -1) { + if (sysctl(mib, nitems(mib), &tm, &size, NULL, 0) == -1) { syslog(LOG_ERR, "cannot get boottime: %m"); exit(1); } @@ -629,11 +629,11 @@ configure(int so) mib[3] = AF_INET; mib[4] = NET_RT_IFLIST; mib[5] = 0; - if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) + if (sysctl(mib, nitems(mib), NULL, &needed, NULL, 0) < 0) quit("route-sysctl-estimate"); if ((buf = malloc(needed)) == NULL) quit("malloc"); - if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) + if (sysctl(mib, nitems(mib), buf, &needed, NULL, 0) < 0) quit("actual retrieval of interface table"); lim = buf + needed; |