diff options
| author | ngie <ngie@FreeBSD.org> | 2017-03-30 06:13:54 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-03-30 06:13:54 +0000 |
| commit | c87d758070f452fef559232425ff239e43db113d (patch) | |
| tree | 9f0fde7bb7abfe0024a958c9b56ce89433813517 /usr.sbin | |
| parent | 305bfec805cf4cbb3ff06f1af26322f516992f74 (diff) | |
| download | FreeBSD-src-c87d758070f452fef559232425ff239e43db113d.zip FreeBSD-src-c87d758070f452fef559232425ff239e43db113d.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.c | 23 | ||||
| -rw-r--r-- | usr.sbin/ctld/kernel.c | 9 |
2 files changed, 15 insertions, 17 deletions
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index ec0a322..6a85c68 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 ef0534f..940a4c3 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> |
