stand: Automated cleanup of cdefs and other formatting

Apply the following automated changes to try to eliminate
no-longer-needed sys/cdefs.h includes as well as now-empty
blank lines in a row.

Remove /^#if.*\n#endif.*\n#include\s+<sys/cdefs.h>.*\n/
Remove /\n+#include\s+<sys/cdefs.h>.*\n+#if.*\n#endif.*\n+/
Remove /\n+#if.*\n#endif.*\n+/
Remove /^#if.*\n#endif.*\n/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/types.h>/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/param.h>/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/capsicum.h>/

Sponsored by:		Netflix

stand/arm64/libarm64/cache.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <machine/armreg.h>

stand/common/bcache.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 /*
  * Simple hashed block cache

stand/common/console.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <stand.h>
 #include <string.h>

stand/common/gfx_fb.c

@@ -82,7 +82,6 @@
  * from VGA colors to console colors, while we are reading RGB data.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <stand.h>
 #include <teken.h>

stand/common/install.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>

stand/common/interp_forth.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>		/* to pick up __FreeBSD_version */
 #include <string.h>
 #include <stand.h>

stand/common/load_elf.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/exec.h>

stand/common/load_elf_obj.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/linker.h>

stand/common/ls.c

@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>

stand/common/reloc_elf.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/elf.h>
 

stand/common/self_reloc.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <elf.h>
 #include <bootstrap.h>

stand/common/tslog.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <stand.h>

stand/efi/boot1/boot1.c

@@ -19,7 +19,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <machine/elf.h>
 #include <machine/stdarg.h>

stand/efi/boot1/proto.c

@@ -19,7 +19,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <machine/elf.h>
 #include <machine/stdarg.h>

stand/efi/boot1/ufs_module.c

@@ -32,7 +32,7 @@
 
 #include <stdarg.h>
 #include <stdbool.h>
-#include <sys/cdefs.h>
+
 #include <sys/param.h>
 #include <sys/disk/bsd.h>
 #include <efi.h>

stand/efi/boot1/zfs_module.c

@@ -26,7 +26,7 @@
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdbool.h>
-#include <sys/cdefs.h>
+
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <efi.h>

stand/efi/fdt/efi_fdt.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <stand.h>
 #include <efi.h>

stand/efi/gptboot/proto.c

@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <machine/elf.h>
 #include <machine/stdarg.h>

stand/efi/libefi/efi_console.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <efi.h>
 #include <efilib.h>

stand/efi/libefi/efichar.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <errno.h>
 #ifdef _STANDALONE

stand/efi/libefi/efihttp.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <netinet/in.h>

stand/efi/libefi/efinet.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <net/ethernet.h>
 #include <netinet/in.h>

stand/efi/libefi/efizfs.c

@@ -25,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <stand.h>
 

stand/efi/loader/arch/arm/exec.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>
 

stand/efi/loader/arch/riscv/exec.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>
 

stand/efi/loader/copy.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <stand.h>

stand/i386/boot0/boot0.S

@@ -16,18 +16,11 @@
  */
 
 /* build options: */
-#ifdef SIO		/* use serial console on COM1.	*/
-#endif
 
 #ifdef PXE		/* enable PXE/INT18 booting with F6 */
 #define SAVE_MORE_MEMORY
 #endif
 
-#ifdef CHECK_DRIVE	/* make sure we boot from a HD. */
-#endif
-
-#ifdef ONLY_F_KEYS	/* Only F1..F6, no digits on console */
-#endif
 
 #ifdef VOLUME_SERIAL	/* support Volume serial number */
 #define B0_BASE	0x1ae	/* move the internal data area */

stand/i386/boot2/boot2.c

@@ -13,7 +13,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disklabel.h>
 #include <sys/diskmbr.h>

stand/i386/common/cons.c

@@ -13,7 +13,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <machine/psl.h>

stand/i386/common/drv.c

@@ -14,7 +14,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <btxv86.h>

stand/i386/gptboot/gptboot.c

@@ -13,7 +13,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/gpt.h>
 #include <sys/dirent.h>

stand/i386/isoboot/isoboot.c

@@ -13,7 +13,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/gpt.h>
 #include <sys/dirent.h>

stand/i386/libi386/elf32_freebsd.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/linker.h>

stand/i386/libi386/multiboot.c

@@ -34,7 +34,6 @@
  * http://www.gnu.org/software/grub/manual/multiboot/multiboot.html
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/linker.h>

stand/kboot/hostcons.c

@@ -23,7 +23,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include "bootstrap.h"
 #include "host_syscall.h"

stand/kboot/hostdisk.c

@@ -24,7 +24,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/disk.h>
 #include <stdarg.h>

stand/kboot/kbootfdt.c

@@ -23,7 +23,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <fdt_platform.h>
 #include <libfdt.h>

stand/liblua/lutils.c

@@ -25,7 +25,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include "lua.h"

stand/libofw/ofw_console.c

@@ -26,7 +26,6 @@
  * the rights to redistribute these changes.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include "bootstrap.h"

stand/libofw/ofw_memory.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 

stand/libofw/ofw_net.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>

stand/libofw/openfirm.h

@@ -60,7 +60,6 @@
  * Prototypes for Open Firmware Interface Routines
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 typedef uint32_t		ihandle_t;

stand/libsa/__main.c

@@ -30,7 +30,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 void __main(void);

stand/libsa/arp.c

@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>

stand/libsa/bcd.c

@@ -3,7 +3,6 @@
  * Cannot be copyrighted.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 u_char const bcd2bin_data[] = {

stand/libsa/cd9660read.c

@@ -32,7 +32,6 @@
 /* Originally derived from libsa/cd9660.c: */
 /*	$NetBSD: cd9660.c,v 1.5 1997/06/26 19:11:33 drochner Exp $	*/
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <fs/cd9660/iso.h>
 #include <fs/cd9660/cd9660_rrip.h>

stand/libsa/dev.c

@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/reboot.h>
 

stand/libsa/ether.c

@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <string.h>

stand/libsa/globals.c

@@ -7,7 +7,6 @@
  *	must be included extraneously.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

stand/libsa/gpt.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/gpt.h>
 

stand/libsa/in_cksum.c

@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/endian.h>
 

stand/libsa/ip.c

@@ -37,7 +37,6 @@
  * once we will implement the support for tcp.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/queue.h>

stand/libsa/net.c

@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 

stand/libsa/netif.c

@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cdefs.h>

stand/libsa/nfs.c

@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>

stand/libsa/preload.c

@@ -24,7 +24,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include "stand.h"
 

stand/libsa/random.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 static long randseed = 1;

stand/libsa/rarp.c

@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>

stand/libsa/read.c

@@ -58,7 +58,6 @@
  * rights to redistribute these changes.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include "stand.h"
 

stand/libsa/readdir.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include "stand.h"
 

stand/libsa/tslog.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #if defined(__amd64__) || defined(__i386__)

stand/libsa/twiddle.c

@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include "stand.h"
 

stand/libsa/udp.c

@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 

stand/libsa/write.c

@@ -58,7 +58,6 @@
  * rights to redistribute these changes.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include "stand.h"
 

stand/libsa/zalloc.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 /*

stand/libsa/zfs/nvlist.c

@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/stdint.h>

stand/powerpc/boot1.chrp/boot1.c

@@ -15,7 +15,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/dirent.h>
 #include <sys/endian.h>

stand/powerpc/ofw/elf_freebsd.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>
 

stand/uboot/copy.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <stand.h>

stand/uboot/elf_freebsd.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>
 

stand/uboot/glue.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <zlib.h>

stand/uboot/main.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <stand.h>

stand/uboot/net.c

@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>

stand/uboot/uboot_disk.c

@@ -31,7 +31,6 @@
  * Block storage I/O routines for U-Boot
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <machine/stdarg.h>

stand/uboot/uboot_fdt.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <stand.h>
 #include <fdt_platform.h>

stand/userboot/userboot/elf32_freebsd.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/linker.h>