From 32e86a82f54826f14ea381affa6674db3aa3b5ae Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 24 Nov 2023 13:12:57 -0700 Subject: [PATCH] sbin: 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+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- sbin/bectl/bectl.c | 1 - sbin/bectl/bectl_jail.c | 1 - sbin/bectl/bectl_list.c | 1 - sbin/camcontrol/depop.c | 1 - sbin/camcontrol/fwdownload.c | 1 - sbin/camcontrol/timestamp.c | 1 - sbin/ccdconfig/ccdconfig.c | 1 - sbin/conscontrol/conscontrol.c | 1 - sbin/ddb/ddb_capture.c | 1 - sbin/ddb/ddb_script.c | 1 - sbin/decryptcore/decryptcore.c | 1 - sbin/devd/devd.cc | 1 - sbin/devfs/devfs.c | 1 - sbin/devfs/rule.c | 1 - sbin/devmatch/devmatch.c | 1 - sbin/dump/dumprmt.c | 3 --- sbin/dump/itime.c | 3 --- sbin/dump/optr.c | 3 --- sbin/dump/tape.c | 3 --- sbin/dump/traverse.c | 3 --- sbin/dump/unctime.c | 3 --- sbin/fdisk/fdisk_mbr_enc.c | 1 - sbin/fsck/fsck.c | 1 - sbin/fsck_ffs/dir.c | 3 --- sbin/fsck_ffs/ea.c | 1 - sbin/fsck_ffs/fsutil.c | 3 --- sbin/fsck_ffs/inode.c | 3 --- sbin/fsck_ffs/pass1.c | 3 --- sbin/fsck_ffs/pass1b.c | 3 --- sbin/fsck_ffs/pass2.c | 3 --- sbin/fsck_ffs/pass3.c | 3 --- sbin/fsck_ffs/pass4.c | 3 --- sbin/fsck_ffs/pass5.c | 3 --- sbin/fsck_ffs/setup.c | 3 --- sbin/fsck_ffs/suj.c | 1 - sbin/fsck_ffs/utilities.c | 3 --- sbin/geom/core/geom.c | 1 - sbin/geom/misc/subr.c | 1 - sbin/hastctl/hastctl.c | 1 - sbin/hastd/activemap.c | 1 - sbin/hastd/control.c | 1 - sbin/hastd/ebuf.c | 1 - sbin/hastd/hastd.c | 1 - sbin/hastd/hooks.c | 1 - sbin/hastd/nv.c | 1 - sbin/hastd/pjdlog.c | 1 - sbin/hastd/primary.c | 1 - sbin/hastd/proto.c | 1 - sbin/hastd/proto_common.c | 1 - sbin/hastd/proto_socketpair.c | 1 - sbin/hastd/proto_tcp.c | 1 - sbin/hastd/secondary.c | 1 - sbin/hastd/subr.c | 1 - sbin/ifconfig/ifgre.c | 1 - sbin/ifconfig/ifipsec.c | 1 - sbin/ifconfig/ifvxlan.c | 1 - sbin/ipfw/nat64clat.c | 1 - sbin/ipfw/nat64lsn.c | 1 - sbin/ipfw/nat64stl.c | 1 - sbin/ipfw/nptv6.c | 1 - sbin/kldconfig/kldconfig.c | 1 - sbin/kldload/kldload.c | 1 - sbin/kldstat/kldstat.c | 1 - sbin/kldunload/kldunload.c | 1 - sbin/md5/md5.c | 1 - sbin/mdmfs/mdmfs.c | 1 - sbin/mount/getmntopts.c | 3 --- sbin/mount/vfslist.c | 3 --- sbin/mount_fusefs/mount_fusefs.c | 1 - sbin/newfs/mkfs.c | 3 --- sbin/nvmecontrol/comnd.c | 1 - sbin/nvmecontrol/devlist.c | 1 - sbin/nvmecontrol/firmware.c | 1 - sbin/nvmecontrol/format.c | 1 - sbin/nvmecontrol/identify.c | 1 - sbin/nvmecontrol/identify_ext.c | 1 - sbin/nvmecontrol/logpage.c | 1 - sbin/nvmecontrol/modules/intel/intel.c | 1 - sbin/nvmecontrol/modules/samsung/samsung.c | 1 - sbin/nvmecontrol/modules/wdc/wdc.c | 1 - sbin/nvmecontrol/ns.c | 1 - sbin/nvmecontrol/nsid.c | 1 - sbin/nvmecontrol/nvmecontrol.c | 1 - sbin/nvmecontrol/passthru.c | 1 - sbin/nvmecontrol/perftest.c | 1 - sbin/nvmecontrol/power.c | 1 - sbin/nvmecontrol/reset.c | 1 - sbin/nvmecontrol/resv.c | 1 - sbin/nvmecontrol/sanitize.c | 1 - sbin/nvmecontrol/selftest.c | 1 - sbin/pfctl/pf_print_state.c | 1 - sbin/pfctl/pf_ruleset.c | 1 - sbin/pfctl/pfctl_optimize.c | 1 - sbin/pfctl/pfctl_osfp.c | 1 - sbin/pfctl/pfctl_parser.c | 1 - sbin/pfctl/pfctl_radix.c | 1 - sbin/pfctl/pfctl_table.c | 1 - sbin/pfctl/tests/pfctl_test.c | 2 +- sbin/pfilctl/pfilctl.c | 1 - sbin/ping/main.c | 1 - sbin/ping/tests/in_cksum_test.c | 1 - sbin/restore/dirs.c | 3 --- sbin/restore/interactive.c | 4 ---- sbin/restore/restore.c | 4 ---- sbin/restore/symtab.c | 3 --- sbin/restore/tape.c | 4 ---- sbin/restore/utilities.c | 3 --- sbin/routed/rtquery/rtquery.c | 1 - sbin/savecore/savecore.c | 1 - sbin/sysctl/sysctl.c | 1 - sbin/zfsbootcfg/zfsbootcfg.c | 1 - 111 files changed, 1 insertion(+), 166 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 05ed8d6be5bd..e398e055a3b2 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/bectl/bectl_jail.c b/sbin/bectl/bectl_jail.c index ae48202163de..fa063962dada 100644 --- a/sbin/bectl/bectl_jail.c +++ b/sbin/bectl/bectl_jail.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/bectl/bectl_list.c b/sbin/bectl/bectl_list.c index 0fcb5deb37f3..c158aa9b1600 100644 --- a/sbin/bectl/bectl_list.c +++ b/sbin/bectl/bectl_list.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/camcontrol/depop.c b/sbin/camcontrol/depop.c index 3be67650cdae..4aff0284abe1 100644 --- a/sbin/camcontrol/depop.c +++ b/sbin/camcontrol/depop.c @@ -50,7 +50,6 @@ * 'depop' provides a wrapper around all these functions. */ -#include #include #include diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c index 25b98c804e3e..2ab18c93392b 100644 --- a/sbin/camcontrol/fwdownload.c +++ b/sbin/camcontrol/fwdownload.c @@ -49,7 +49,6 @@ * specified device. */ -#include #include #include diff --git a/sbin/camcontrol/timestamp.c b/sbin/camcontrol/timestamp.c index 403c126c95d9..3130dec188dc 100644 --- a/sbin/camcontrol/timestamp.c +++ b/sbin/camcontrol/timestamp.c @@ -35,7 +35,6 @@ * SCSI tape drive timestamp support */ -#include #include #include diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index fd62c459a78f..6b8086ef0213 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -32,7 +32,6 @@ * NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ */ -#include #include #include #include diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c index b8890cf22030..9c7ec9175910 100644 --- a/sbin/conscontrol/conscontrol.c +++ b/sbin/conscontrol/conscontrol.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ddb/ddb_capture.c b/sbin/ddb/ddb_capture.c index fcff16e292ea..ab8b2c1ed0bb 100644 --- a/sbin/ddb/ddb_capture.c +++ b/sbin/ddb/ddb_capture.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ddb/ddb_script.c b/sbin/ddb/ddb_script.c index c40b8b96b21f..76724df8d772 100644 --- a/sbin/ddb/ddb_script.c +++ b/sbin/ddb/ddb_script.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/decryptcore/decryptcore.c b/sbin/decryptcore/decryptcore.c index adeccfac8d47..1e7cf4070e51 100644 --- a/sbin/decryptcore/decryptcore.c +++ b/sbin/decryptcore/decryptcore.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 05715c18708f..8d621e42a232 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -63,7 +63,6 @@ // - devd needs to document the unix domain socket // - devd.conf needs more details on the supported statements. -#include #include #include #include diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c index 72feed7fb857..ae8954e9d88b 100644 --- a/sbin/devfs/devfs.c +++ b/sbin/devfs/devfs.c @@ -30,7 +30,6 @@ * DEVFS control. */ -#include #include #include diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c index b9b493ae3742..d07104d1de13 100644 --- a/sbin/devfs/rule.c +++ b/sbin/devfs/rule.c @@ -30,7 +30,6 @@ * Rule subsystem manipulation. */ -#include #include #include #include diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 2485120c57b6..d93a35e5633d 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index ef75be6f2a1f..4f61905eb60e 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index adeaa044ff4f..ba6ccaf47f04 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index 15d34020b24c..f263f48374ae 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index dd3a7672586d..e448bacf61b6 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index c166b6a1af24..ccc2d0a625e9 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c index 86ce682642b5..82ee12597c05 100644 --- a/sbin/dump/unctime.c +++ b/sbin/dump/unctime.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include /* diff --git a/sbin/fdisk/fdisk_mbr_enc.c b/sbin/fdisk/fdisk_mbr_enc.c index 6fe99bbba1b3..d621124c7a85 100644 --- a/sbin/fdisk/fdisk_mbr_enc.c +++ b/sbin/fdisk/fdisk_mbr_enc.c @@ -33,7 +33,6 @@ * NB! This file must be usable both in kernel and userland. */ -#include #include #include #include diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c index 6bef9a31b8f5..4c24cc9813e1 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c @@ -34,7 +34,6 @@ * $NetBSD: fsck.c,v 1.30 2003/08/07 10:04:15 agc Exp $ */ -#include #include #include #include diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 597cb1996401..cc63aadae04c 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c index 8e5e8ebe8aa0..f6ebc5c072fc 100644 --- a/sbin/fsck_ffs/ea.c +++ b/sbin/fsck_ffs/ea.c @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 7e9a2c4661ef..aa536fb5dd4e 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 8b154d972dd3..5b004cd29c90 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 99da2db3bc6b..f4f97a38097b 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index fe6acd4c27db..3fb9cab89078 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index d92bf22c4394..1755a1295a9e 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c index ac0b61437ccb..853f5d62382f 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c index bddd7ca9a94f..a261051c432a 100644 --- a/sbin/fsck_ffs/pass4.c +++ b/sbin/fsck_ffs/pass4.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index efe36ca42cb4..528a6956c4a1 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 71088ee13849..f10f02d159c3 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index e1fd54229d69..73be60c5e5b4 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c index e5ec06cb101e..56655089b9d6 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index ccaf7adca305..950f6790b1a8 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c index 2d3db86c943f..18bac7108ed0 100644 --- a/sbin/geom/misc/subr.c +++ b/sbin/geom/misc/subr.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c index ab2d618c698c..224adce2810e 100644 --- a/sbin/hastctl/hastctl.c +++ b/sbin/hastctl/hastctl.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c index f5e3c60fd0a0..42f3d03b5482 100644 --- a/sbin/hastd/activemap.c +++ b/sbin/hastd/activemap.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include /* powerof2() */ #include diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c index f6f937d3b180..13a0c5e0af30 100644 --- a/sbin/hastd/control.c +++ b/sbin/hastd/control.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c index 522e4e821b11..fdb5c442bfa5 100644 --- a/sbin/hastd/ebuf.c +++ b/sbin/hastd/ebuf.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c index f303f277e0ad..c62b85fd1925 100644 --- a/sbin/hastd/hastd.c +++ b/sbin/hastd/hastd.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c index 7a5ccb4e22e6..43ba6f06851a 100644 --- a/sbin/hastd/hooks.c +++ b/sbin/hastd/hooks.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c index 5f50ae349023..47499ce27294 100644 --- a/sbin/hastd/nv.c +++ b/sbin/hastd/nv.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c index 6726cab47697..3dbbe163812e 100644 --- a/sbin/hastd/pjdlog.c +++ b/sbin/hastd/pjdlog.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index 76c454d14a74..5d166a088b9b 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c index 56ff4933c9b8..93c9a064215d 100644 --- a/sbin/hastd/proto.c +++ b/sbin/hastd/proto.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c index 143b7666b7ca..39ef696f5b69 100644 --- a/sbin/hastd/proto_common.c +++ b/sbin/hastd/proto_common.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c index ab30a6a27263..2d3d61693e1b 100644 --- a/sbin/hastd/proto_socketpair.c +++ b/sbin/hastd/proto_socketpair.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c index dc5a23da7b23..aeec887433f8 100644 --- a/sbin/hastd/proto_tcp.c +++ b/sbin/hastd/proto_tcp.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include /* MAXHOSTNAMELEN */ #include diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index bf118d7e1237..6bf889bba657 100644 --- a/sbin/hastd/secondary.c +++ b/sbin/hastd/secondary.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index 27641a6f8acb..2a26482b3727 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c index dda04e363bfc..3eeed8f3d200 100644 --- a/sbin/ifconfig/ifgre.c +++ b/sbin/ifconfig/ifgre.c @@ -25,7 +25,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ifconfig/ifipsec.c b/sbin/ifconfig/ifipsec.c index 6fd1f9f630f4..b8ab38d6165a 100644 --- a/sbin/ifconfig/ifipsec.c +++ b/sbin/ifconfig/ifipsec.c @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ifconfig/ifvxlan.c b/sbin/ifconfig/ifvxlan.c index e4871da645fd..cbea685b6ba0 100644 --- a/sbin/ifconfig/ifvxlan.c +++ b/sbin/ifconfig/ifvxlan.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ipfw/nat64clat.c b/sbin/ipfw/nat64clat.c index e8b767a0c801..63fa7dae14e2 100644 --- a/sbin/ipfw/nat64clat.c +++ b/sbin/ipfw/nat64clat.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ipfw/nat64lsn.c b/sbin/ipfw/nat64lsn.c index f50ea3661236..0a3e0415d459 100644 --- a/sbin/ipfw/nat64lsn.c +++ b/sbin/ipfw/nat64lsn.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ipfw/nat64stl.c b/sbin/ipfw/nat64stl.c index d8dd239e7daa..b6c970001f5c 100644 --- a/sbin/ipfw/nat64stl.c +++ b/sbin/ipfw/nat64stl.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c index fc9ce638b8af..83bf4c768fd9 100644 --- a/sbin/ipfw/nptv6.c +++ b/sbin/ipfw/nptv6.c @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c index 27956a961ccf..570ca5cbf713 100644 --- a/sbin/kldconfig/kldconfig.c +++ b/sbin/kldconfig/kldconfig.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c index c573a253c7c3..82469a2d40f3 100644 --- a/sbin/kldload/kldload.c +++ b/sbin/kldload/kldload.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c index 60d12e0327ab..79c647576440 100644 --- a/sbin/kldstat/kldstat.c +++ b/sbin/kldstat/kldstat.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c index ebdc17ce414f..69739d0f4afe 100644 --- a/sbin/kldunload/kldunload.c +++ b/sbin/kldunload/kldunload.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 15fd7ebec5d4..abaadb12f3ee 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -17,7 +17,6 @@ * documentation and/or software. */ -#include #include #include #include diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index dbd206f953d2..93fa9e8ff0c0 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -32,7 +32,6 @@ * the deprecated mount_mfs(8). */ -#include #include #include #include diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index 331584d885cb..0912b1e1a306 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c index 6648866234b0..ea6086651483 100644 --- a/sbin/mount/vfslist.c +++ b/sbin/mount/vfslist.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/sbin/mount_fusefs/mount_fusefs.c b/sbin/mount_fusefs/mount_fusefs.c index 59667c39db10..8b1797747a25 100644 --- a/sbin/mount_fusefs/mount_fusefs.c +++ b/sbin/mount_fusefs/mount_fusefs.c @@ -33,7 +33,6 @@ * */ -#include #include #include #include diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 6b5263aef3f4..db1fe2991f6d 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -38,9 +38,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #define _WANT_P_OSREL #include #include diff --git a/sbin/nvmecontrol/comnd.c b/sbin/nvmecontrol/comnd.c index de979af71d90..112857f58943 100644 --- a/sbin/nvmecontrol/comnd.c +++ b/sbin/nvmecontrol/comnd.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c index 7e3dfe60fff4..ff926987aed6 100644 --- a/sbin/nvmecontrol/devlist.c +++ b/sbin/nvmecontrol/devlist.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c index 256847ef8ac2..71e744605c66 100644 --- a/sbin/nvmecontrol/firmware.c +++ b/sbin/nvmecontrol/firmware.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index 541b207b373f..03706765df38 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c index 50698e8bfc70..253682c64a99 100644 --- a/sbin/nvmecontrol/identify.c +++ b/sbin/nvmecontrol/identify.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c index 72b1ff5ccd7b..2c2ba2435133 100644 --- a/sbin/nvmecontrol/identify_ext.c +++ b/sbin/nvmecontrol/identify_ext.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 725815edc475..23c7bbfa4559 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/modules/intel/intel.c b/sbin/nvmecontrol/modules/intel/intel.c index cc5c9c49beb5..725111cd92ab 100644 --- a/sbin/nvmecontrol/modules/intel/intel.c +++ b/sbin/nvmecontrol/modules/intel/intel.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/modules/samsung/samsung.c b/sbin/nvmecontrol/modules/samsung/samsung.c index cc4528a0a78c..82e7af8ecd33 100644 --- a/sbin/nvmecontrol/modules/samsung/samsung.c +++ b/sbin/nvmecontrol/modules/samsung/samsung.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/modules/wdc/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c index 2600464eeb0a..55758dc7e037 100644 --- a/sbin/nvmecontrol/modules/wdc/wdc.c +++ b/sbin/nvmecontrol/modules/wdc/wdc.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index dd678568d5ca..3d3cccf6c8da 100644 --- a/sbin/nvmecontrol/ns.c +++ b/sbin/nvmecontrol/ns.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/nsid.c b/sbin/nvmecontrol/nsid.c index 3d71186f396a..c49cec246737 100644 --- a/sbin/nvmecontrol/nsid.c +++ b/sbin/nvmecontrol/nsid.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c index 92fbf9e25378..10623799d705 100644 --- a/sbin/nvmecontrol/nvmecontrol.c +++ b/sbin/nvmecontrol/nvmecontrol.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/nvmecontrol/passthru.c b/sbin/nvmecontrol/passthru.c index 015c52305ceb..cf38e185a582 100644 --- a/sbin/nvmecontrol/passthru.c +++ b/sbin/nvmecontrol/passthru.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c index 0afab9951e50..59439d3ed2a9 100644 --- a/sbin/nvmecontrol/perftest.c +++ b/sbin/nvmecontrol/perftest.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/power.c b/sbin/nvmecontrol/power.c index 95ee1763a28c..de384f719a14 100644 --- a/sbin/nvmecontrol/power.c +++ b/sbin/nvmecontrol/power.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/reset.c b/sbin/nvmecontrol/reset.c index 4cd4987d88b5..267413c975f8 100644 --- a/sbin/nvmecontrol/reset.c +++ b/sbin/nvmecontrol/reset.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/resv.c b/sbin/nvmecontrol/resv.c index 835ad47a924c..d607b0b015e6 100644 --- a/sbin/nvmecontrol/resv.c +++ b/sbin/nvmecontrol/resv.c @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/sanitize.c b/sbin/nvmecontrol/sanitize.c index d56a74685651..df1081217262 100644 --- a/sbin/nvmecontrol/sanitize.c +++ b/sbin/nvmecontrol/sanitize.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/nvmecontrol/selftest.c b/sbin/nvmecontrol/selftest.c index 6139a7902234..a1f09f46b206 100644 --- a/sbin/nvmecontrol/selftest.c +++ b/sbin/nvmecontrol/selftest.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 20594e050c9e..36c2103a2142 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -32,7 +32,6 @@ * */ -#include #include #include #include diff --git a/sbin/pfctl/pf_ruleset.c b/sbin/pfctl/pf_ruleset.c index 09ee0fdb916c..2b7ec09f28aa 100644 --- a/sbin/pfctl/pf_ruleset.c +++ b/sbin/pfctl/pf_ruleset.c @@ -36,7 +36,6 @@ * $OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $ */ -#include #include #include #include diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index a377f9eb04dc..aefd7b6471e5 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -16,7 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/sbin/pfctl/pfctl_osfp.c b/sbin/pfctl/pfctl_osfp.c index 7fcdcf96228d..649c1e8a2c3b 100644 --- a/sbin/pfctl/pfctl_osfp.c +++ b/sbin/pfctl/pfctl_osfp.c @@ -16,7 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index cb307cd6ede5..7dc0c3ae0cf2 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -33,7 +33,6 @@ * */ -#include #include #include #include diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index d33f091d8b69..b1180b40dfee 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -32,7 +32,6 @@ * */ -#include #include #include #include diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index fe934a8d2ea2..6085722f9306 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -32,7 +32,6 @@ * */ -#include #include #include #include diff --git a/sbin/pfctl/tests/pfctl_test.c b/sbin/pfctl/tests/pfctl_test.c index 5a98ad9f0d5f..cc69ed4e002a 100644 --- a/sbin/pfctl/tests/pfctl_test.c +++ b/sbin/pfctl/tests/pfctl_test.c @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include + #include #include #include diff --git a/sbin/pfilctl/pfilctl.c b/sbin/pfilctl/pfilctl.c index c2fe04ecc777..268f5a8d0e70 100644 --- a/sbin/pfilctl/pfilctl.c +++ b/sbin/pfilctl/pfilctl.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ping/main.c b/sbin/ping/main.c index 65896a5dba7b..1d1816361788 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ping/tests/in_cksum_test.c b/sbin/ping/tests/in_cksum_test.c index fd51a83b1f4a..ffdf8b4c63c5 100644 --- a/sbin/ping/tests/in_cksum_test.c +++ b/sbin/ping/tests/in_cksum_test.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c index aa57809c5b4f..16fdecba6c18 100644 --- a/sbin/restore/dirs.c +++ b/sbin/restore/dirs.c @@ -34,9 +34,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c index fd8a063bdac3..ea7fc0f18b64 100644 --- a/sbin/restore/interactive.c +++ b/sbin/restore/interactive.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - -#include #include #include diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c index bfe0f5f49fdc..1a5e16174b2c 100644 --- a/sbin/restore/restore.c +++ b/sbin/restore/restore.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - -#include #include #include diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c index 6b3a136f88bf..3ae6bf20c7be 100644 --- a/sbin/restore/symtab.c +++ b/sbin/restore/symtab.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - /* * These routines maintain the symbol table which tracks the state * of the file system being restored. They provide lookup by either diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index dde20333a437..4c5d828027a5 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -34,10 +34,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - -#include #include #include #include diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c index 50d080d24dae..c4d4fb1ea42f 100644 --- a/sbin/restore/utilities.c +++ b/sbin/restore/utilities.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c index 24946a2b4c7a..67a635545624 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index a571144589bb..fe42eb66eaae 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -62,7 +62,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 7ed7be95c9a5..c37c1f3f7400 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/zfsbootcfg/zfsbootcfg.c b/sbin/zfsbootcfg/zfsbootcfg.c index 0c1e9e0f7ea1..03b028a9ab71 100644 --- a/sbin/zfsbootcfg/zfsbootcfg.c +++ b/sbin/zfsbootcfg/zfsbootcfg.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include