svn commit: r311709 - head/usr.sbin/rwhod
Ngie Cooper
ngie at FreeBSD.org
Mon Jan 9 00:25:35 UTC 2017
Author: ngie
Date: Mon Jan 9 00:25:33 2017
New Revision: 311709
URL: https://svnweb.freebsd.org/changeset/base/311709
Log:
Style(9) fixes
- Sort sys/ #includes
- Use nitems instead of hardcoding the length of `mib`
MFC after: 3 days
Modified:
head/usr.sbin/rwhod/rwhod.c
Modified: head/usr.sbin/rwhod/rwhod.c
==============================================================================
--- head/usr.sbin/rwhod/rwhod.c Mon Jan 9 00:09:19 2017 (r311708)
+++ head/usr.sbin/rwhod/rwhod.c Mon Jan 9 00:25:33 2017 (r311709)
@@ -43,14 +43,14 @@ static char sccsid[] = "@(#)rwhod.c 8.1
#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;
More information about the svn-src-head
mailing list