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 05ed8d6be5b..e398e055a3b 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 ae48202163d..fa063962dad 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 0fcb5deb37f..c158aa9b160 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 3be67650cda..4aff0284abe 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 25b98c804e3..2ab18c93392 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 403c126c95d..3130dec188d 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 fd62c459a78..6b8086ef021 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 b8890cf2203..9c7ec917591 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 fcff16e292e..ab8b2c1ed0b 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 c40b8b96b21..76724df8d77 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 adeccfac8d4..1e7cf4070e5 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 05715c18708..8d621e42a23 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 72feed7fb85..ae8954e9d88 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 b9b493ae374..d07104d1de1 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 2485120c57b..d93a35e5633 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 ef75be6f2a1..4f61905eb60 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 adeaa044ff4..ba6ccaf47f0 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 15d34020b24..f263f48374a 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 dd3a7672586..e448bacf61b 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 c166b6a1af2..ccc2d0a625e 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 86ce682642b..82ee12597c0 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 6fe99bbba1b..d621124c7a8 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 6bef9a31b8f..4c24cc9813e 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 597cb199640..cc63aadae04 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 8e5e8ebe8aa..f6ebc5c072f 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 7e9a2c4661e..aa536fb5dd4 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 8b154d972dd..5b004cd29c9 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 99da2db3bc6..f4f97a38097 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 fe6acd4c27d..3fb9cab8907 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 d92bf22c439..1755a1295a9 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 ac0b61437cc..853f5d62382 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 bddd7ca9a94..a261051c432 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 efe36ca42cb..528a6956c4a 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 71088ee1384..f10f02d159c 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 e1fd54229d6..73be60c5e5b 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 e5ec06cb101..56655089b9d 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 ccaf7adca30..950f6790b1a 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 2d3db86c943..18bac7108ed 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 ab2d618c698..224adce2810 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 f5e3c60fd0a..42f3d03b548 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 f6f937d3b18..13a0c5e0af3 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 522e4e821b1..fdb5c442bfa 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 f303f277e0a..c62b85fd192 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 7a5ccb4e22e..43ba6f06851 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 5f50ae34902..47499ce2729 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 6726cab4769..3dbbe163812 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 76c454d14a7..5d166a088b9 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 56ff4933c9b..93c9a064215 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 143b7666b7c..39ef696f5b6 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 ab30a6a2726..2d3d61693e1 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 dc5a23da7b2..aeec887433f 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 bf118d7e123..6bf889bba65 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 27641a6f8ac..2a26482b372 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 dda04e363bf..3eeed8f3d20 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 6fd1f9f630f..b8ab38d6165 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 e4871da645f..cbea685b6ba 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 e8b767a0c80..63fa7dae14e 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 f50ea366123..0a3e0415d45 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 d8dd239e7da..b6c970001f5 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 fc9ce638b8a..83bf4c768fd 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 27956a961cc..570ca5cbf71 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 c573a253c7c..82469a2d40f 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 60d12e0327a..79c64757644 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 ebdc17ce414..69739d0f4af 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 15fd7ebec5d..abaadb12f3e 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 dbd206f953d..93fa9e8ff0c 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 331584d885c..0912b1e1a30 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 6648866234b..ea608665148 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 59667c39db1..8b1797747a2 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 6b5263aef3f..db1fe2991f6 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 de979af71d9..112857f5894 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 7e3dfe60fff..ff926987aed 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 256847ef8ac..71e744605c6 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 541b207b373..03706765df3 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 50698e8bfc7..253682c64a9 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 72b1ff5ccd7..2c2ba243513 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 725815edc47..23c7bbfa455 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 cc5c9c49beb..725111cd92a 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 cc4528a0a78..82e7af8ecd3 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 2600464eeb0..55758dc7e03 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 dd678568d5c..3d3cccf6c8d 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 3d71186f396..c49cec24673 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 92fbf9e2537..10623799d70 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 015c52305ce..cf38e185a58 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 0afab9951e5..59439d3ed2a 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 95ee1763a28..de384f719a1 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 4cd4987d88b..267413c975f 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 835ad47a924..d607b0b015e 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 d56a7468565..df108121726 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 6139a790223..a1f09f46b20 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 20594e050c9..36c2103a214 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 09ee0fdb916..2b7ec09f28a 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 a377f9eb04d..aefd7b6471e 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 7fcdcf96228..649c1e8a2c3 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 cb307cd6ede..7dc0c3ae0cf 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 d33f091d8b6..b1180b40dfe 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 fe934a8d2ea..6085722f930 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 5a98ad9f0d5..cc69ed4e002 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 c2fe04ecc77..268f5a8d0e7 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 65896a5dba7..1d181636178 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 fd51a83b1f4..ffdf8b4c63c 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 aa57809c5b4..16fdecba6c1 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 fd8a063bdac..ea7fc0f18b6 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 bfe0f5f49fd..1a5e16174b2 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 6b3a136f88b..3ae6bf20c7b 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 dde20333a43..4c5d828027a 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 50d080d24da..c4d4fb1ea42 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 24946a2b4c7..67a63554562 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 a571144589b..fe42eb66eaa 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 7ed7be95c9a..c37c1f3f740 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 0c1e9e0f7ea..03b028a9ab7 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