From 2c2f6738b579517f91bee29a22746012d90e9ad5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 26 Apr 2023 06:06:03 +0200 Subject: fclose: Make last change more maintainable. * m4/fclose.m4 (gl_FUNC_FCLOSE): Define through AC_DEFUN_ONCE. Don't modify REPLACE_FOPEN. * modules/fclose (Depends-on): Add comment. (configure.ac): Don't modify REPLACE_FOPEN. Don't duplicate actions of module 'fopen'. * m4/fopen.m4 (gl_FUNC_FOPEN_ITSELF): Renamed from gl_FUNC_FOPEN. (gl_FUNC_FOPEN): New macro. * modules/fopen (Files): Add m4/fclose.m4, m4/fflush.m4. * m4/close.m4 (gl_FUNC_CLOSE): Define through AC_DEFUN_ONCE. --- ChangeLog | 13 +++++++++++++ m4/close.m4 | 4 ++-- m4/fclose.m4 | 8 ++------ m4/fopen.m4 | 13 +++++++++++-- modules/fclose | 10 ++++------ modules/fopen | 2 ++ 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67378ac0ae..04c5243b2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2023-04-26 Bruno Haible + + fclose: Make last change more maintainable. + * m4/fclose.m4 (gl_FUNC_FCLOSE): Define through AC_DEFUN_ONCE. Don't + modify REPLACE_FOPEN. + * modules/fclose (Depends-on): Add comment. + (configure.ac): Don't modify REPLACE_FOPEN. Don't duplicate actions of + module 'fopen'. + * m4/fopen.m4 (gl_FUNC_FOPEN_ITSELF): Renamed from gl_FUNC_FOPEN. + (gl_FUNC_FOPEN): New macro. + * modules/fopen (Files): Add m4/fclose.m4, m4/fflush.m4. + * m4/close.m4 (gl_FUNC_CLOSE): Define through AC_DEFUN_ONCE. + 2023-04-26 Po Lu (tiny change) Bruno Haible diff --git a/m4/close.m4 b/m4/close.m4 index 9f95c670e5..0feabd6917 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,10 +1,10 @@ -# close.m4 serial 9 +# close.m4 serial 10 dnl Copyright (C) 2008-2023 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. -AC_DEFUN([gl_FUNC_CLOSE], +AC_DEFUN_ONCE([gl_FUNC_CLOSE], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) m4_ifdef([gl_MSVC_INVAL], [ diff --git a/m4/fclose.m4 b/m4/fclose.m4 index 74b7df0a77..e9291f0bda 100644 --- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -1,10 +1,10 @@ -# fclose.m4 serial 10 +# fclose.m4 serial 11 dnl Copyright (C) 2008-2023 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. -AC_DEFUN([gl_FUNC_FCLOSE], +AC_DEFUN_ONCE([gl_FUNC_FCLOSE], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) @@ -31,10 +31,6 @@ AC_DEFUN([gl_FUNC_FCLOSE], *) REPLACE_FCLOSE=1 ;; esac fi - - if test $REPLACE_FCLOSE = 1; then - REPLACE_FOPEN=1 - fi ]) dnl Determine whether fclose works on input streams. diff --git a/m4/fopen.m4 b/m4/fopen.m4 index 6806394f8c..7daa4caec5 100644 --- a/m4/fopen.m4 +++ b/m4/fopen.m4 @@ -1,10 +1,10 @@ -# fopen.m4 serial 14 +# fopen.m4 serial 15 dnl Copyright (C) 2007-2023 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. -AC_DEFUN([gl_FUNC_FOPEN], +AC_DEFUN([gl_FUNC_FOPEN_ITSELF], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) @@ -58,6 +58,15 @@ changequote([,])dnl esac ]) +AC_DEFUN([gl_FUNC_FOPEN], +[ + AC_REQUIRE([gl_FUNC_FOPEN_ITSELF]) + AC_REQUIRE([gl_FUNC_FCLOSE]) + if test $REPLACE_FCLOSE = 1; then + REPLACE_FOPEN=1 + fi +]) + AC_DEFUN([gl_FUNC_FOPEN_GNU], [ AC_REQUIRE([gl_FUNC_FOPEN]) diff --git a/modules/fclose b/modules/fclose index 9a949e48b8..0ef34bdfd9 100644 --- a/modules/fclose +++ b/modules/fclose @@ -9,18 +9,16 @@ Depends-on: stdio close [test $REPLACE_FCLOSE = 1] fflush [test $REPLACE_FCLOSE = 1] -fopen [test $REPLACE_FCLOSE = 1] freading [test $REPLACE_FCLOSE = 1] lseek [test $REPLACE_FCLOSE = 1] msvc-inval [test $REPLACE_FCLOSE = 1] +# The code of fclose does not need to call fopen. But when gcc's '-fanalyzer' +# option is in use and stdio.h does '#define fclose rpl_fclose', stdio.h also +# needs to do '#define fopen rpl_fopen', otherwise a warning may result. +fopen [test $REPLACE_FCLOSE = 1] configure.ac: gl_FUNC_FCLOSE -if test $REPLACE_FCLOSE = 1; then - REPLACE_FOPEN=1 - AC_LIBOBJ([fopen]) - gl_PREREQ_FOPEN -fi gl_CONDITIONAL([GL_COND_OBJ_FCLOSE], [test $REPLACE_FCLOSE = 1]) gl_STDIO_MODULE_INDICATOR([fclose]) diff --git a/modules/fopen b/modules/fopen index da216c9cec..3d538393f1 100644 --- a/modules/fopen +++ b/modules/fopen @@ -4,6 +4,8 @@ fopen() function: open a stream to a file. Files: lib/fopen.c m4/fopen.m4 +m4/fclose.m4 +m4/fflush.m4 Depends-on: stdio -- cgit v1.2.1