diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2023-01-30 09:49:11 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2023-01-30 09:58:54 -0800 |
commit | fd9898dc4b5d6cccfa4f65a819263113998d466c (patch) | |
tree | 9dd51de09c3e6709ec128b367b14712b20913cc2 | |
parent | 1b995bcf1b4278d369ae003d1b551c4342242571 (diff) | |
download | sed-fd9898dc4b5d6cccfa4f65a819263113998d466c.tar.gz |
maint: omit unnecessary Gnulib modules
* basicdefs.h: Do not include alloca.h.
* bootstrap.conf (gnulib_modules): Remove alloca, stdalign,
c-ctype, closeout, mbrlen, verify.
Add version-etc.
* lib/.gitignore, m4/.gitignore: Omit now-unused files.
* po/POTFILES.in: Remove closeout.c.
* testsuite/test-mbrtowc.c: Do not include closeout.h.
(main): Close stdout by hand, to avoid a dependency on closeout.
-rw-r--r-- | basicdefs.h | 1 | ||||
-rw-r--r-- | bootstrap.conf | 6 | ||||
-rw-r--r-- | lib/.gitignore | 6 | ||||
-rw-r--r-- | m4/.gitignore | 1 | ||||
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | testsuite/test-mbrtowc.c | 4 |
6 files changed, 2 insertions, 17 deletions
diff --git a/basicdefs.h b/basicdefs.h index 3b99883..31899c2 100644 --- a/basicdefs.h +++ b/basicdefs.h @@ -17,7 +17,6 @@ #ifndef BASICDEFS_H #define BASICDEFS_H -#include <alloca.h> #include <wchar.h> #include <locale.h> #include <wctype.h> diff --git a/bootstrap.conf b/bootstrap.conf index 31e526b..4f42f1a 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -22,12 +22,8 @@ avoided_gnulib_modules=' # gnulib modules used by this package. gnulib_modules=' acl -alloca -stdalign binary-io btowc -c-ctype -closeout dfa eloop-threshold extensions @@ -40,7 +36,6 @@ idx ignore-value localcharset manywarnings -mbrlen mbrtowc mbsinit memchr @@ -65,7 +60,6 @@ strtoimax strverscmp unlocked-io update-copyright -verify version-etc-fsf wcrtomb wctob diff --git a/lib/.gitignore b/lib/.gitignore index 1050937..2adc903 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -6,7 +6,6 @@ /acl.h /acl_entries.c /alignof.h -/alloca.c /alloca.h /alloca.in.h /arg-nonnull.h @@ -33,8 +32,6 @@ /close-stream.c /close-stream.h /close.c -/closeout.c -/closeout.h /copy-acl.c /ctype.h /ctype.in.h @@ -104,7 +101,6 @@ /malloc/ /malloca.c /malloca.h -/mbrlen.c /mbrtowc-impl-utf8.h /mbrtowc-impl.h /mbrtowc.c @@ -173,8 +169,6 @@ /stat-w32.c /stat-w32.h /stat.c -/stdalign.h -/stdalign.in.h /stdarg.h /stdarg.in.h /stdckdint.h diff --git a/m4/.gitignore b/m4/.gitignore index 1a22886..1954750 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -97,7 +97,6 @@ /malloca.m4 /manywarnings-c++.m4 /manywarnings.m4 -/mbrlen.m4 /mbrtowc.m4 /mbsinit.m4 /mbstate_t.m4 diff --git a/po/POTFILES.in b/po/POTFILES.in index ac26e8f..e73be5d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,3 @@ -lib/closeout.c lib/copy-acl.c lib/dfa.c lib/error.c diff --git a/testsuite/test-mbrtowc.c b/testsuite/test-mbrtowc.c index d6d155b..12b2f1a 100644 --- a/testsuite/test-mbrtowc.c +++ b/testsuite/test-mbrtowc.c @@ -122,7 +122,6 @@ #include <stdlib.h> #include <wchar.h> -#include "closeout.h" #include "error.h" #include "progname.h" @@ -164,7 +163,8 @@ main (int argc, char **argv) if (ferror (stdin)) die ("read error"); - close_stdout (); + if (ferror (stdout) || fclose (stdout) != 0) + die ("write error"); exit (EXIT_SUCCESS); } |