summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2017-03-30 06:13:39 +0000
committerngie <ngie@FreeBSD.org>2017-03-30 06:13:39 +0000
commit49c42033b745df74cfc193bce2bb844e1b503db5 (patch)
tree5455a766aa89923d689d76ad0c852261a0838fc6 /usr.sbin
parentf4a5c589f8b9118bba83357f088cd2c5f670f769 (diff)
downloadFreeBSD-src-49c42033b745df74cfc193bce2bb844e1b503db5.zip
FreeBSD-src-49c42033b745df74cfc193bce2bb844e1b503db5.tar.gz
MFC r316050,r316051:
r316050: ctld: sort #includes per style(9) - Only include sys/types.h or sys/param.h, not both. - Sort alphabetically. r316051: ctldadm: sort #includes per style(9) - Only include sys/types.h or sys/param.h, not both. - Sort alphabetically.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ctladm/ctladm.c23
-rw-r--r--usr.sbin/ctld/kernel.c9
2 files changed, 15 insertions, 17 deletions
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index fe4caae..b61b8a3 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -43,25 +43,24 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/param.h>
+#include <sys/callout.h>
+#include <sys/ioctl.h>
#include <sys/linker.h>
#include <sys/queue.h>
-#include <sys/callout.h>
#include <sys/sbuf.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <sys/stat.h>
+#include <bsdxml.h>
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
#include <string.h>
-#include <errno.h>
-#include <err.h>
-#include <ctype.h>
-#include <bsdxml.h>
+#include <unistd.h>
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_message.h>
#include <cam/ctl/ctl.h>
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index 40ef682..057ea34 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -37,15 +37,14 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/param.h>
+#include <sys/capsicum.h>
+#include <sys/callout.h>
+#include <sys/ioctl.h>
#include <sys/linker.h>
#include <sys/queue.h>
-#include <sys/callout.h>
#include <sys/sbuf.h>
-#include <sys/capsicum.h>
+#include <sys/stat.h>
#include <assert.h>
#include <bsdxml.h>
#include <ctype.h>
OpenPOWER on IntegriCloud