tools: 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
2024-11-13 05:41:26 +01:00 · 2023-11-24 13:12:57 -07:00 · 2023-11-24 13:12:57 -07:00 · 6bfca4dcab
commit 6bfca4dcab
parent 6dced2c635
55 changed files with 6 additions and 57 deletions
--- a/tools/build/cross-build/capsicum_stubs.c
+++ b/tools/build/cross-build/capsicum_stubs.c
@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 */
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <sys/capsicum.h>

--- a/tools/build/cross-build/fgetln_fallback.c
+++ b/tools/build/cross-build/fgetln_fallback.c
@ -26,7 +26,7 @@
 */

 #include <stdio.h>
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <string.h>

--- a/tools/build/cross-build/include/linux/libutil.h
+++ b/tools/build/cross-build/include/linux/libutil.h
@ -35,7 +35,6 @@
 */
 #pragma once

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>

--- a/tools/bus_space/C/lang.c
+++ b/tools/bus_space/C/lang.c
@ -24,7 +24,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <errno.h>

--- a/tools/regression/aio/aiop/aiop.c
+++ b/tools/regression/aio/aiop/aiop.c
@ -38,7 +38,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/disk.h>
 #include <sys/ioctl.h>
--- a/tools/regression/capsicum/syscalls/cap_fcntls_limit.c
+++ b/tools/regression/capsicum/syscalls/cap_fcntls_limit.c
@ -27,7 +27,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/procdesc.h>
--- a/tools/regression/capsicum/syscalls/cap_getmode.c
+++ b/tools/regression/capsicum/syscalls/cap_getmode.c
@ -27,7 +27,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/procdesc.h>
--- a/tools/regression/capsicum/syscalls/cap_ioctls_limit.c
+++ b/tools/regression/capsicum/syscalls/cap_ioctls_limit.c
@ -27,7 +27,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/ioctl.h>
--- a/tools/regression/capsicum/syscalls/misc.c
+++ b/tools/regression/capsicum/syscalls/misc.c
@ -27,7 +27,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/select.h>
 #include <sys/socket.h>
--- a/tools/regression/ethernet/ethermulti/ethermulti.c
+++ b/tools/regression/ethernet/ethermulti/ethermulti.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
--- a/tools/regression/geom_gpt/gctl_test_helper.c
+++ b/tools/regression/geom_gpt/gctl_test_helper.c
@ -24,7 +24,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <assert.h>
 #include <err.h>
--- a/tools/regression/kthread/kld/kthrdlk.c
+++ b/tools/regression/kthread/kld/kthrdlk.c
@ -32,7 +32,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
--- a/tools/regression/netinet/ipbroadcast/ipbroadcast.c
+++ b/tools/regression/netinet/ipbroadcast/ipbroadcast.c
@ -28,7 +28,6 @@
 * Test utility for IPv4 broadcast sockets.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
--- a/tools/regression/netinet/ipmulticast/ipmulticast.c
+++ b/tools/regression/netinet/ipmulticast/ipmulticast.c
@ -32,7 +32,6 @@
 * TODO: Merge multicast socket option tests from ipsockopt.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
--- a/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c
+++ b/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c
@ -25,7 +25,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>

--- a/tools/regression/netinet6/inet6_rth/test_subr.c
+++ b/tools/regression/netinet6/inet6_rth/test_subr.c
@ -25,7 +25,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>

 #include <stdio.h>
--- a/tools/regression/posixsem/posixsem.c
+++ b/tools/regression/posixsem/posixsem.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/_semaphore.h>
--- a/tools/regression/redzone9/redzone.c
+++ b/tools/regression/redzone9/redzone.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
--- a/tools/regression/security/cap_test/cap_test_capabilities.c
+++ b/tools/regression/security/cap_test/cap_test_capabilities.c
@ -34,7 +34,6 @@
 * various object types.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/errno.h>
--- a/tools/regression/security/cap_test/cap_test_capmode.c
+++ b/tools/regression/security/cap_test/cap_test_capmode.c
@ -31,7 +31,6 @@
 * whether or not they return the expected ECAPMODE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/errno.h>
--- a/tools/regression/security/cap_test/cap_test_fcntl.c
+++ b/tools/regression/security/cap_test/cap_test_fcntl.c
@ -29,7 +29,6 @@
 * Test that fcntl works in capability mode.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/errno.h>
--- a/tools/regression/security/cap_test/cap_test_pdfork.c
+++ b/tools/regression/security/cap_test/cap_test_pdfork.c
@ -31,7 +31,6 @@
 * whether or not they return the expected ECAPMODE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>

 #include <sys/capsium.h>
--- a/tools/regression/security/cap_test/cap_test_pdkill.c
+++ b/tools/regression/security/cap_test/cap_test_pdkill.c
@ -31,7 +31,6 @@
 * whether or not they return the expected ECAPMODE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>

 #include <sys/capsicum.h>
--- a/tools/regression/security/cap_test/cap_test_relative.c
+++ b/tools/regression/security/cap_test/cap_test_relative.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/errno.h>
--- a/tools/regression/security/cap_test/cap_test_sysctl.c
+++ b/tools/regression/security/cap_test/cap_test_sysctl.c
@ -29,7 +29,6 @@
 * Test that various sysctls are (and aren't) available on capability mode.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/errno.h>
--- a/tools/regression/security/open_to_operation/open_to_operation.c
+++ b/tools/regression/security/open_to_operation/open_to_operation.c
@ -89,7 +89,6 @@
 * XXXRW: message queue and shared memory fds?
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
--- a/tools/regression/sockets/udp_pingpong/udp_pingpong.c
+++ b/tools/regression/sockets/udp_pingpong/udp_pingpong.c
@ -34,7 +34,6 @@
 * sure it makes sense.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
--- a/tools/regression/sockets/unix_cmsg/t_cmsg_len.c
+++ b/tools/regression/sockets/unix_cmsg/t_cmsg_len.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
--- a/tools/regression/sockets/unix_cmsg/t_cmsgcred.c
+++ b/tools/regression/sockets/unix_cmsg/t_cmsgcred.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
--- a/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c
+++ b/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
--- a/tools/regression/sockets/unix_cmsg/t_generic.c
+++ b/tools/regression/sockets/unix_cmsg/t_generic.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
--- a/tools/regression/sockets/unix_cmsg/t_peercred.c
+++ b/tools/regression/sockets/unix_cmsg/t_peercred.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ucred.h>
--- a/tools/regression/sockets/unix_cmsg/t_sockcred.c
+++ b/tools/regression/sockets/unix_cmsg/t_sockcred.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
--- a/tools/regression/sockets/unix_cmsg/unix_cmsg.c
+++ b/tools/regression/sockets/unix_cmsg/unix_cmsg.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/limits.h>
 #include <sys/socket.h>
--- a/tools/test/iconv/const-gnuism.c
+++ b/tools/test/iconv/const-gnuism.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>

 #include <err.h>
--- a/tools/test/iconv/posix/posix.c
+++ b/tools/test/iconv/posix/posix.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/endian.h>

--- a/tools/test/pthread_vfork/pthread_vfork_test.c
+++ b/tools/test/pthread_vfork/pthread_vfork_test.c
@ -26,7 +26,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <err.h>
--- a/tools/test/ptrace/scescx.c
+++ b/tools/test/ptrace/scescx.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <sys/syscall.h>
--- a/tools/test/stress2/misc/kern_umtx_inf_loop.sh
+++ b/tools/test/stress2/misc/kern_umtx_inf_loop.sh
@ -46,7 +46,6 @@ EOF
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>

 #include <machine/cpufunc.h>
--- a/tools/test/stress2/misc/ldt.sh
+++ b/tools/test/stress2/misc/ldt.sh
@ -284,7 +284,6 @@ EOF
 	cat > fault.c <<EOF
 /* \$Id: fault.c,v 1.5 2008/10/28 17:39:16 kostik Exp \$ */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ucontext.h>
 #include <errno.h>
--- a/tools/tools/aac/aac_checkq.c
+++ b/tools/tools/aac/aac_checkq.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
--- a/tools/tools/bootparttest/bootparttest.c
+++ b/tools/tools/bootparttest/bootparttest.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>

--- a/tools/tools/dmardump/dmardump.c
+++ b/tools/tools/dmardump/dmardump.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/pciio.h>
--- a/tools/tools/drm/radeon/mkregtable/mkregtable.c
+++ b/tools/tools/drm/radeon/mkregtable/mkregtable.c
@ -9,7 +9,6 @@
 * 	Dave Airlie
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
--- a/tools/tools/ifpifa/ifpifa.c
+++ b/tools/tools/ifpifa/ifpifa.c
@ -28,7 +28,7 @@

 #include <sys/types.h>
 #include <sys/callout.h>
-#include <sys/cdefs.h>
+
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/queue.h>
--- a/tools/tools/ipw/ipwstats.c
+++ b/tools/tools/ipw/ipwstats.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>

--- a/tools/tools/iwi/iwistats.c
+++ b/tools/tools/iwi/iwistats.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>

--- a/tools/tools/mfi/mfi_checkq.c
+++ b/tools/tools/mfi/mfi_checkq.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
--- a/tools/tools/ncpus/biosmptable.c
+++ b/tools/tools/ncpus/biosmptable.c
@ -30,7 +30,6 @@
 * the number of cpu's identified.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <x86/mptable.h>

--- a/tools/tools/netmap/nmreplay.c
+++ b/tools/tools/netmap/nmreplay.c
@ -1538,8 +1538,7 @@ uniform_delay_run(struct _qs *q, struct _cfg *arg)
 {
 	uint64_t x = my_random24();
 	q->cur_delay = arg->d[0] + ((arg->d[2] * x) >> 24);
-#if 0 /* COMPUTE_STATS */
-#endif /* COMPUTE_STATS */
+
 	return 0;
 }

--- a/tools/tools/pciroms/pciroms.c
+++ b/tools/tools/pciroms/pciroms.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/pciio.h>
--- a/tools/tools/pirtool/pirtool.c
+++ b/tools/tools/pirtool/pirtool.c
@ -29,7 +29,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 *
 */
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
--- a/tools/tools/switch_tls/switch_tls.c
+++ b/tools/tools/switch_tls/switch_tls.c
@ -17,7 +17,6 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
--- a/tools/tools/tscdrift/tscdrift.c
+++ b/tools/tools/tscdrift/tscdrift.c
@ -25,8 +25,6 @@
 * SUCH DAMAGE.
 */

-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/cpuset.h>
 #include <machine/atomic.h>
--- a/tools/tools/vhba/vhba.h
+++ b/tools/tools/vhba/vhba.h
@ -26,7 +26,7 @@
 /*
 * Virtual HBA defines
 */
-#include <sys/cdefs.h>
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/endian.h>