bin: 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
brooksdavis · Nov 27, 2023 · e043f37 · e043f37
1 parent 0b8224d
commit e043f37
Show file tree

Hide file tree

Showing 69 changed files with 0 additions and 180 deletions.
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/param.h>
 #include <sys/stat.h>

diff --git a/bin/cp/utils.c b/bin/cp/utils.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/acl.h>
 #include <sys/stat.h>

diff --git a/bin/date/date.c b/bin/date/date.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/dd/args.c b/bin/dd/args.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <ctype.h>

diff --git a/bin/dd/conv.c b/bin/dd/conv.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <err.h>

diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <signal.h>

diff --git a/bin/dd/misc.c b/bin/dd/misc.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>

diff --git a/bin/dd/position.c b/bin/dd/position.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/mtio.h>
 

diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>

diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c
@@ -30,8 +30,6 @@
  * and send the results to stdout
  */
 
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/acl.h>

diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <err.h>

diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 

diff --git a/bin/ls/print.c b/bin/ls/print.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/acl.h>

diff --git a/bin/ls/util.c b/bin/ls/util.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 

diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>

diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>

diff --git a/bin/pax/cache.c b/bin/pax/cache.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>

diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
@@ -10,7 +10,6 @@
  * in the Public Domain for your edification and enjoyment.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>

diff --git a/bin/pax/options.c b/bin/pax/options.c
@@ -33,10 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mtio.h>

diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>

diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/pax/tables.c b/bin/pax/tables.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/pax/tar.c b/bin/pax/tar.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
@@ -32,7 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>

diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>

diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 

diff --git a/bin/ps/print.c b/bin/ps/print.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>

diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c
@@ -31,7 +31,6 @@
  * OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>

diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <err.h>

diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/acl.h>
 

diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/acl.h>
 #include <sys/stat.h>

diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/acl.h>
 #include <sys/stat.h>

diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/acl.h>
 #include <sys/stat.h>

diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/acl.h>
 #include <sys/queue.h>

diff --git a/bin/sh/alias.c b/bin/sh/alias.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <stdlib.h>
 #include "shell.h"
 #include "output.h"