From: Jim Meyering <jim@meyering.net>
Date: Wed, 23 Jul 2003 07:29:54 +0000 (+0000)
Subject: Don't include headers already included by system.h:
X-Git-Tag: v5.0.90~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f4e9aa8e16aaaf7dea9bb8053168316c0515626;p=thirdparty%2Fcoreutils.git

Don't include headers already included by system.h:
Don't include closeout.h.
---

diff --git a/src/basename.c b/src/basename.c
index f76defb91b..805ee25caa 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -33,7 +33,6 @@
 #include "long-options.h"
 #include "dirname.h"
 #include "error.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "basename"
diff --git a/src/cat.c b/src/cat.c
index a13b9f99e3..cf0a90016a 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -31,7 +31,6 @@
 # include <sys/ioctl.h>
 #endif
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "full-write.h"
 #include "safe-read.h"
diff --git a/src/chroot.c b/src/chroot.c
index 8be5fe6a0a..78836c8a5a 100644
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -24,7 +24,6 @@
 #include "system.h"
 #include "long-options.h"
 #include "error.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chroot"
diff --git a/src/cksum.c b/src/cksum.c
index 7291ad4370..4d0fec187d 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -117,7 +117,6 @@ main (void)
 #else /* !CRCTAB */
 
 # include <getopt.h>
-# include "closeout.h"
 # include "long-options.h"
 # include "error.h"
 # include "inttostr.h"
diff --git a/src/comm.c b/src/comm.c
index 26716dfc19..efa5ee4313 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -23,7 +23,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 #include "linebuffer.h"
 #include "error.h"
 #include "hard-locale.h"
diff --git a/src/csplit.c b/src/csplit.c
index e17b4a7b93..e6bdb558c5 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -26,7 +26,6 @@
 #include <signal.h>
 
 #include "system.h"
-#include "closeout.h"
 
 #include <regex.h>
 
diff --git a/src/cut.c b/src/cut.c
index bd2a3e098f..f14eea890d 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include "system.h"
 
-#include "closeout.h"
 #include "error.h"
 #include "getdelim2.h"
 #include "hash.h"
diff --git a/src/date.c b/src/date.c
index 8f52f3708d..d77d8ca48d 100644
--- a/src/date.c
+++ b/src/date.c
@@ -27,7 +27,6 @@
 
 #include "system.h"
 #include "argmatch.h"
-#include "closeout.h"
 #include "error.h"
 #include "exitfail.h"
 #include "getdate.h"
diff --git a/src/dd.c b/src/dd.c
index ee4ea68c5a..9977592014 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -27,7 +27,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "full-write.h"
 #include "getpagesize.h"
diff --git a/src/dirname.c b/src/dirname.c
index 5670ec6c2d..ec4e353f79 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -25,7 +25,6 @@
 #include "long-options.h"
 #include "error.h"
 #include "dirname.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dirname"
diff --git a/src/echo.c b/src/echo.c
index 9ce8547ad7..e1629a638c 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 #include "long-options.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
diff --git a/src/env.c b/src/env.c
index 27414a2888..440ec8fb3d 100644
--- a/src/env.c
+++ b/src/env.c
@@ -85,7 +85,6 @@
 
 #include "system.h"
 #include "error.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "env"
diff --git a/src/expand.c b/src/expand.c
index 1cc7f754b3..fcd35429bb 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -39,7 +39,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "posixver.h"
 #include "quote.h"
diff --git a/src/expr.c b/src/expr.c
index c7f81db3fa..b6132755a3 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -36,7 +36,6 @@
 #include <regex.h>
 #include "long-options.h"
 #include "error.h"
-#include "closeout.h"
 #include "exitfail.h"
 #include "inttostr.h"
 #include "quotearg.h"
diff --git a/src/factor.c b/src/factor.c
index 6c01d39647..c364781a1d 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -26,7 +26,6 @@
 #define NDEBUG 1
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "inttostr.h"
 #include "long-options.h"
diff --git a/src/fmt.c b/src/fmt.c
index a263b1a3e6..aa188d65d3 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -27,7 +27,6 @@
 #define word unused_word_type
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "quote.h"
 #include "xstrtol.h"
diff --git a/src/fold.c b/src/fold.c
index 5787810ad6..8caed2f9e5 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "posixver.h"
 #include "xstrtol.h"
diff --git a/src/head.c b/src/head.c
index 4028d85da4..3d8103f853 100644
--- a/src/head.c
+++ b/src/head.c
@@ -32,7 +32,6 @@
 
 #include "system.h"
 
-#include "closeout.h"
 #include "error.h"
 #include "full-write.h"
 #include "full-read.h"
diff --git a/src/hostid.c b/src/hostid.c
index a0ea77be8a..3119aadff8 100644
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "long-options.h"
 #include "error.h"
 
diff --git a/src/hostname.c b/src/hostname.c
index 540310115e..8f97a7affa 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "long-options.h"
 #include "error.h"
 
diff --git a/src/id.c b/src/id.c
index d0c3aa2a5f..2880928d6f 100644
--- a/src/id.c
+++ b/src/id.c
@@ -28,7 +28,6 @@
 
 #include "system.h"
 #include "error.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "id"
diff --git a/src/join.c b/src/join.c
index f6d9b06a0d..554df88fdc 100644
--- a/src/join.c
+++ b/src/join.c
@@ -25,7 +25,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "hard-locale.h"
 #include "linebuffer.h"
diff --git a/src/kill.c b/src/kill.c
index 2808305f30..7f3ecb14b6 100644
--- a/src/kill.c
+++ b/src/kill.c
@@ -34,7 +34,6 @@
 #endif
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "sig2str.h"
 
diff --git a/src/logname.c b/src/logname.c
index 52c3baae37..4ff8639242 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -21,7 +21,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "long-options.h"
 
diff --git a/src/md5sum.c b/src/md5sum.c
index 43c1ef79f5..2473020217 100644
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -29,7 +29,6 @@
 #include "sha.h"
 #include "checksum.h"
 #include "getline.h"
-#include "closeout.h"
 #include "error.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
diff --git a/src/nice.c b/src/nice.c
index b05b6cc41b..6270b8b7c7 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -29,7 +29,6 @@
 #endif
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "long-options.h"
 #include "posixver.h"
diff --git a/src/nl.c b/src/nl.c
index 4f372d0d8f..befbc0e4d1 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -25,7 +25,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 
 #include <regex.h>
 
diff --git a/src/nohup.c b/src/nohup.c
index eee2ca0999..9a7221f8c0 100644
--- a/src/nohup.c
+++ b/src/nohup.c
@@ -24,7 +24,6 @@
 
 #include "system.h"
 
-#include "closeout.h"
 #include "error.h"
 #include "long-options.h"
 #include "path-concat.h"
diff --git a/src/od.c b/src/od.c
index 08620a93f1..710786e0f4 100644
--- a/src/od.c
+++ b/src/od.c
@@ -24,7 +24,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "posixver.h"
 #include "xstrtol.h"
diff --git a/src/paste.c b/src/paste.c
index 3ce91f0662..dfc46cafc2 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -41,7 +41,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
diff --git a/src/pathchk.c b/src/pathchk.c
index 728a0af094..4a8064befb 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -46,7 +46,6 @@
 #include "system.h"
 #include "error.h"
 #include "long-options.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pathchk"
diff --git a/src/pinky.c b/src/pinky.c
index ce5e03bfe7..827112a2a0 100644
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -27,7 +27,6 @@
 
 #include "error.h"
 #include "readutmp.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pinky"
diff --git a/src/pr.c b/src/pr.c
index fba74ce377..e6883bbbe8 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -315,7 +315,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "mbswidth.h"
 #include "posixver.h"
diff --git a/src/printenv.c b/src/printenv.c
index f1aa79ffd5..0ad821b08d 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -33,7 +33,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "exitfail.h"
 #include "long-options.h"
diff --git a/src/printf.c b/src/printf.c
index 361334acc5..97b7d97621 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -54,7 +54,6 @@
 #include "system.h"
 #include "long-options.h"
 #include "error.h"
-#include "closeout.h"
 #include "unicodeio.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
diff --git a/src/ptx.c b/src/ptx.c
index 92252cdb85..614ec50f27 100644
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -24,7 +24,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 #include "argmatch.h"
 #include "bumpalloc.h"
 #include "diacrit.h"
diff --git a/src/pwd.c b/src/pwd.c
index 7d828f79fa..c4be503d88 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "long-options.h"
 #include "error.h"
 #include "xgetcwd.h"
diff --git a/src/seq.c b/src/seq.c
index cae6276c45..b073c3c01a 100644
--- a/src/seq.c
+++ b/src/seq.c
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "xstrtol.h"
 #include "xstrtod.h"
diff --git a/src/setuidgid.c b/src/setuidgid.c
index 6bf84d1176..9a4354153c 100644
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -25,7 +25,6 @@
 
 #include "system.h"
 
-#include "closeout.h"
 #include "error.h"
 #include "long-options.h"
 #include "quote.h"
diff --git a/src/shred.c b/src/shred.c
index 5060c9a461..9453cb30cf 100644
--- a/src/shred.c
+++ b/src/shred.c
@@ -104,7 +104,6 @@
 
 #include "system.h"
 #include "xstrtol.h"
-#include "closeout.h"
 #include "error.h"
 #include "human.h"
 #include "inttostr.h"
diff --git a/src/sleep.c b/src/sleep.c
index 6050f0fde1..5a4bd3d573 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -22,7 +22,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "long-options.h"
 #include "xnanosleep.h"
diff --git a/src/sort.c b/src/sort.c
index 6316759249..76f3c73f41 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "exitfail.h"
 #include "hard-locale.h"
diff --git a/src/split.c b/src/split.c
index c70e53a0e8..499f7c46bc 100644
--- a/src/split.c
+++ b/src/split.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "dirname.h"
 #include "error.h"
 #include "full-read.h"
diff --git a/src/stat.c b/src/stat.c
index f44ae8925b..ace2b6936d 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -44,7 +44,6 @@
 
 #include "system.h"
 
-#include "closeout.h"
 #include "error.h"
 #include "filemode.h"
 #include "file-type.h"
diff --git a/src/stty.c b/src/stty.c
index 70fe34f893..71e0eb3fa2 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -59,7 +59,6 @@
 #include "long-options.h"
 #include "error.h"
 #include "xstrtol.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "stty"
diff --git a/src/su.c b/src/su.c
index 2321039214..3bcc87abde 100644
--- a/src/su.c
+++ b/src/su.c
@@ -82,7 +82,6 @@
 #define getusershell _getusershell_sys_proto_
 
 #include "system.h"
-#include "closeout.h"
 #include "dirname.h"
 
 #undef getusershell
diff --git a/src/sum.c b/src/sum.c
index 06bfdb3d1e..9abd4f3f0b 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -25,7 +25,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "human.h"
 #include "safe-read.h"
diff --git a/src/tac.c b/src/tac.c
index 7a366ec6f3..4567e8705d 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -41,7 +41,6 @@ tac -r -s '.\|
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 
 #include <regex.h>
 
diff --git a/src/tail.c b/src/tail.c
index 9d8468b647..934e805e47 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -32,7 +32,6 @@
 #include <signal.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "argmatch.h"
 #include "error.h"
 #include "inttostr.h"
diff --git a/src/tee.c b/src/tee.c
index 2caf59991e..4ec399b852 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -24,7 +24,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
diff --git a/src/test.c b/src/test.c
index 6c9eaf0ffe..95cff6ebf8 100644
--- a/src/test.c
+++ b/src/test.c
@@ -963,7 +963,6 @@ posixtest (void)
 
 #if defined (TEST_STANDALONE)
 # include "long-options.h"
-# include "closeout.h"
 
 void
 usage (int status)
diff --git a/src/tr.c b/src/tr.c
index 27f6a4a4c7..5722b4bbdf 100644
--- a/src/tr.c
+++ b/src/tr.c
@@ -25,7 +25,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "safe-read.h"
 #include "xstrtol.h"
diff --git a/src/true.c b/src/true.c
index 5c5ab22c11..d7468ac3b4 100644
--- a/src/true.c
+++ b/src/true.c
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include "system.h"
 #include "version-etc.h"
-#include "closeout.h"
 
 #define PROGRAM_NAME "true"
 #define AUTHORS "Jim Meyering"
diff --git a/src/tsort.c b/src/tsort.c
index 57421a522b..a66d37ba42 100644
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -29,7 +29,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "long-options.h"
 #include "error.h"
 #include "readtokens.h"
diff --git a/src/tty.c b/src/tty.c
index 555fe19cfb..076ac15d78 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "exitfail.h"
 #include "error.h"
 
diff --git a/src/uname.c b/src/uname.c
index 0d81a14345..47f9ff45ca 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -46,7 +46,6 @@
 
 #include "system.h"
 #include "error.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uname"
diff --git a/src/unexpand.c b/src/unexpand.c
index 423f43b2bc..89cac644fc 100644
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -41,7 +41,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "posixver.h"
 
diff --git a/src/uniq.c b/src/uniq.c
index 86721c43a9..9555d6c86d 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "argmatch.h"
 #include "linebuffer.h"
 #include "error.h"
diff --git a/src/uptime.c b/src/uptime.c
index 934b1b8a47..c987a2a32c 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -31,7 +31,6 @@
 #include "error.h"
 #include "long-options.h"
 #include "readutmp.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uptime"
diff --git a/src/users.c b/src/users.c
index bee2ff36d8..6ef4396c01 100644
--- a/src/users.c
+++ b/src/users.c
@@ -27,7 +27,6 @@
 #include "error.h"
 #include "long-options.h"
 #include "readutmp.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "users"
diff --git a/src/wc.c b/src/wc.c
index 1ddd71105f..8593c11845 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -46,7 +46,6 @@
    redefining and using it. */
 #include "system.h"
 
-#include "closeout.h"
 #include "error.h"
 #include "inttostr.h"
 #include "safe-read.h"
diff --git a/src/who.c b/src/who.c
index 2094d41bb3..a3bb7d2efa 100644
--- a/src/who.c
+++ b/src/who.c
@@ -33,7 +33,6 @@
 
 #include "readutmp.h"
 #include "error.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "who"
diff --git a/src/whoami.c b/src/whoami.c
index 7a5121a893..019379e87a 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -26,7 +26,6 @@
 
 #include "system.h"
 #include "long-options.h"
-#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "whoami"
diff --git a/src/yes.c b/src/yes.c
index 34fceb729e..f2e37ce8e9 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -24,7 +24,6 @@
 
 #include "system.h"
 
-#include "closeout.h"
 #include "error.h"
 #include "long-options.h"