Date: Thu, 30 Mar 2017 06:13:39 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r316252 - in stable/11/usr.sbin: ctladm ctld Message-ID: <201703300613.v2U6DdAt007163@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Mar 30 06:13:39 2017 New Revision: 316252 URL: https://svnweb.freebsd.org/changeset/base/316252 Log: 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. Modified: stable/11/usr.sbin/ctladm/ctladm.c stable/11/usr.sbin/ctld/kernel.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/ctladm/ctladm.c ============================================================================== --- stable/11/usr.sbin/ctladm/ctladm.c Thu Mar 30 06:11:56 2017 (r316251) +++ stable/11/usr.sbin/ctladm/ctladm.c Thu Mar 30 06:13:39 2017 (r316252) @@ -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> Modified: stable/11/usr.sbin/ctld/kernel.c ============================================================================== --- stable/11/usr.sbin/ctld/kernel.c Thu Mar 30 06:11:56 2017 (r316251) +++ stable/11/usr.sbin/ctld/kernel.c Thu Mar 30 06:13:39 2017 (r316252) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703300613.v2U6DdAt007163>