From 077b4d40995287fe5b85e8872dca4f2dc4bc36d0 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 15 Aug 2026 12:38:41 -0700 Subject: [PATCH] sed: #include file cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This mostly avoids including files no longer needed. It also moves dfa.h down, and removes stat-macros.h. * bootstrap.conf (gnulib_modules): Remove stat-macros. * lib/.gitignore: Adjust. * sed/compile.c: Don’t include stdio.h, sys/types.h. stdio.h is guaranteed by sed/sed.h, and sys/types.h should now be redundant. * sed/debug.c: Don’t include ctype.h, stdio.h, string.h, sys/types.h. * sed/execute.c: Don’t include stat-macros.h, ctype.h, selinux/context.h, stdio.h, sys/types.h. * sed/local.mk (sed/version.c): Include "version.h" to check interface consistency. * sed/regexp.c: Don’t include ctype.h, limits.h, stdio.h. Do include dfa.h. * sed/sed.c: Don’t include stdio.h, sys/types.h, unistd.h. * sed/sed.h: Don’t include dfa.h. Don’t include stdio.h or unlocked-io.h, as utils.h does that for us. * sed/utils.c: Don’t include unlocked-io.h, stdio.h, sys/types.h. * sed/utils.h: Include unlocked-io.h instead of stdio.h. --- bootstrap.conf | 1 - lib/.gitignore | 1 - sed/compile.c | 2 -- sed/debug.c | 4 ---- sed/execute.c | 5 ----- sed/local.mk | 1 + sed/regexp.c | 4 +--- sed/sed.c | 3 --- sed/sed.h | 3 --- sed/utils.c | 3 --- sed/utils.h | 2 +- 11 files changed, 3 insertions(+), 26 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 9ca6bb1..76f5036 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -61,7 +61,6 @@ regex rename selinux-h ssize_t -stat-macros stdckdint-h streq strerror diff --git a/lib/.gitignore b/lib/.gitignore index 35ac03c..ff4e416 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -216,7 +216,6 @@ /setlocale_null-unlocked.c /setlocale_null.c /setlocale_null.h -/stat-macros.h /stat-time.c /stat-time.h /stat-w32.c diff --git a/sed/compile.c b/sed/compile.c index 30a6da1..150d831 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -27,10 +27,8 @@ #include #include #include -#include #include #include -#include #define obstack_chunk_alloc xzalloc #define obstack_chunk_free free diff --git a/sed/debug.c b/sed/debug.c index 2e0ebbb..8200f7e 100644 --- a/sed/debug.c +++ b/sed/debug.c @@ -20,11 +20,7 @@ #include "sed.h" -#include -#include #include -#include -#include /* indentation level when printing the program */ static off_t block_level = 0; diff --git a/sed/execute.c b/sed/execute.c index fa7a201..855b4b4 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -23,20 +23,15 @@ #include #include #include -#include #include -#include #include -#include #include #include #include -#include #include #include #include -#include #include /* The number of extra bytes that must be allocated/usable, beyond diff --git a/sed/local.mk b/sed/local.mk index 321f601..23fc5be 100644 --- a/sed/local.mk +++ b/sed/local.mk @@ -44,6 +44,7 @@ DISTCLEANFILES += sed/version.c sed/version.c: Makefile $(AM_V_GEN)rm -f $@ $(AM_V_at)printf '#include \n' > $@t + $(AM_V_at)printf '#include "version.h"\n' >> $@t $(AM_V_at)printf 'char const *Version = "$(PACKAGE_VERSION)";\n' >> $@t $(AM_V_at)chmod a-w $@t $(AM_V_at)mv $@t $@ diff --git a/sed/regexp.c b/sed/regexp.c index ccf92d8..ccbf70a 100644 --- a/sed/regexp.c +++ b/sed/regexp.c @@ -18,10 +18,8 @@ #include -#include -#include +#include #include -#include #include #include diff --git a/sed/sed.c b/sed/sed.c index 5a2a4d8..dbfa781 100644 --- a/sed/sed.c +++ b/sed/sed.c @@ -29,11 +29,8 @@ #include #include #include -#include #include #include -#include -#include #define AUTHORS \ _("Jay Fenlason"), \ diff --git a/sed/sed.h b/sed/sed.h index ace81df..50bcd34 100644 --- a/sed/sed.h +++ b/sed/sed.h @@ -18,14 +18,11 @@ #include "utils.h" -#include #include #include -#include #include #include -#include #include #define _(msgid) gettext (msgid) diff --git a/sed/utils.c b/sed/utils.c index ce4eaa9..28aa538 100644 --- a/sed/utils.c +++ b/sed/utils.c @@ -24,17 +24,14 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include -#include #include #include diff --git a/sed/utils.h b/sed/utils.h index 31d2115..4fa1f64 100644 --- a/sed/utils.h +++ b/sed/utils.h @@ -16,7 +16,7 @@ #include -#include +#include enum exit_codes { /* EXIT_SUCCESS is already defined as 0 */