From 07fb4954db5032be9c61af7e014521efb6f7d207 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 14 May 2019 08:20:29 -0700 Subject: [PATCH] close-stream, closein, closeout: simplify MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I noticed this opportunity for simplification while drafting a new, related module that I haven’t had time to finish yet. * m4/close-stream.m4, m4/closein.m4, m4/closeout.m4: Remove. * modules/close-stream (Files): Remove m4/close-stream.m4. (configure.ac): Omit gl_CLOSE_STREAM. * modules/closein (Files): Remove m4/closein.m4 (configure.ac): Omit gl_CLOSEIN. * modules/closeout (Files): Remove m4/closeout.m4. (configure.ac): Omit gl_CLOSEOUT. --- ChangeLog | 13 +++++++++++++ m4/close-stream.m4 | 11 ----------- m4/closein.m4 | 11 ----------- m4/closeout.m4 | 12 ------------ modules/close-stream | 2 -- modules/closein | 2 -- modules/closeout | 2 -- 7 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 m4/close-stream.m4 delete mode 100644 m4/closein.m4 delete mode 100644 m4/closeout.m4 diff --git a/ChangeLog b/ChangeLog index 5d01569a2e..1918041f03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2019-05-14 Paul Eggert + + close-stream, closein, closeout: simplify + I noticed this opportunity for simplification while drafting a + new, related module that I haven’t had time to finish yet. + * m4/close-stream.m4, m4/closein.m4, m4/closeout.m4: Remove. + * modules/close-stream (Files): Remove m4/close-stream.m4. + (configure.ac): Omit gl_CLOSE_STREAM. + * modules/closein (Files): Remove m4/closein.m4 + (configure.ac): Omit gl_CLOSEIN. + * modules/closeout (Files): Remove m4/closeout.m4. + (configure.ac): Omit gl_CLOSEOUT. + 2019-05-12 Bruno Haible libtool-next-version: New program. diff --git a/m4/close-stream.m4 b/m4/close-stream.m4 deleted file mode 100644 index 5d31221b0c..0000000000 --- a/m4/close-stream.m4 +++ /dev/null @@ -1,11 +0,0 @@ -#serial 4 -dnl Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Prerequisites of lib/close-stream.c. -AC_DEFUN([gl_CLOSE_STREAM], -[ - : -]) diff --git a/m4/closein.m4 b/m4/closein.m4 deleted file mode 100644 index 7e5e26cb51..0000000000 --- a/m4/closein.m4 +++ /dev/null @@ -1,11 +0,0 @@ -# closein.m4 serial 2 -dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Prerequisites of lib/closein.c. -AC_DEFUN([gl_CLOSEIN], -[ - : -]) diff --git a/m4/closeout.m4 b/m4/closeout.m4 deleted file mode 100644 index c02179b760..0000000000 --- a/m4/closeout.m4 +++ /dev/null @@ -1,12 +0,0 @@ -# closeout.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Prerequisites of lib/closeout.c. -AC_DEFUN([gl_CLOSEOUT], -[ - : -]) diff --git a/modules/close-stream b/modules/close-stream index dd5522f596..78ed207992 100644 --- a/modules/close-stream +++ b/modules/close-stream @@ -4,14 +4,12 @@ Close a stream, with nicer error checking than fclose's. Files: lib/close-stream.h lib/close-stream.c -m4/close-stream.m4 Depends-on: fpending stdbool configure.ac: -gl_CLOSE_STREAM gl_MODULE_INDICATOR([close-stream]) Makefile.am: diff --git a/modules/closein b/modules/closein index 5f6e7d77ff..6eb7b206bb 100644 --- a/modules/closein +++ b/modules/closein @@ -4,7 +4,6 @@ Close all standard streams, resetting seekable stdin if needed, and exiting with Files: lib/closein.h lib/closein.c -m4/closein.m4 Depends-on: closeout @@ -13,7 +12,6 @@ fflush stdbool configure.ac: -gl_CLOSEIN Makefile.am: lib_SOURCES += closein.c diff --git a/modules/closeout b/modules/closeout index 2987121b27..82e91a7feb 100644 --- a/modules/closeout +++ b/modules/closeout @@ -4,7 +4,6 @@ Close standard output and standard error, exiting with a diagnostic on error. Files: lib/closeout.h lib/closeout.c -m4/closeout.m4 Depends-on: close-stream @@ -15,7 +14,6 @@ exitfail stdbool configure.ac: -gl_CLOSEOUT Makefile.am: lib_SOURCES += closeout.c -- 2.39.5