From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 09D2F384B123; Thu, 9 Jun 2022 21:20:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09D2F384B123 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] libio: Use __libc_feof_unlocked instead of __feof_unlocked X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 8e82ecd0f9e7796a3206b9869bfc88f84776b781 X-Git-Newrev: c169c9fd61884f6c05480c50dfda4e992ad94304 Message-Id: <20220609212012.09D2F384B123@sourceware.org> Date: Thu, 9 Jun 2022 21:20:12 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2022 21:20:12 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c169c9fd61884f6c05480c50dfda4e992ad94304 commit c169c9fd61884f6c05480c50dfda4e992ad94304 Author: Adhemerval Zanella Date: Mon Mar 14 15:04:55 2022 -0300 libio: Use __libc_feof_unlocked instead of __feof_unlocked Internal __feof_unlocked is done using a inline function (regardless of __USE_EXTERN_INLINES). The internal alias is removed since it is not used. Diff: --- include/stdio.h | 9 ++++----- libio/feof_u.c | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index b8f6f8f8b1..51a8d65f22 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -242,8 +242,7 @@ libc_hidden_proto (__fgets_unlocked) libc_hidden_proto (fputs_unlocked) extern __typeof (fputs_unlocked) __fputs_unlocked; libc_hidden_proto (__fputs_unlocked) -libc_hidden_proto (feof_unlocked) -extern __typeof (feof_unlocked) __feof_unlocked attribute_hidden; +extern __typeof (feof_unlocked) __libc_feof_unlocked; libc_hidden_proto (ferror_unlocked) extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden; libc_hidden_proto (getc_unlocked) @@ -265,13 +264,13 @@ libc_hidden_proto (__fmemopen) extern int __gen_tempfd (int flags); libc_hidden_proto (__gen_tempfd) -# ifdef __USE_EXTERN_INLINES -__extern_inline int -__NTH (__feof_unlocked (FILE *__stream)) +static inline int +__feof_unlocked (FILE *__stream) { return __feof_unlocked_body (__stream); } +# ifdef __USE_EXTERN_INLINES __extern_inline int __NTH (__ferror_unlocked (FILE *__stream)) { diff --git a/libio/feof_u.c b/libio/feof_u.c index 5b7477ef54..3db56109c6 100644 --- a/libio/feof_u.c +++ b/libio/feof_u.c @@ -30,10 +30,9 @@ #undef feof_unlocked int -__feof_unlocked (FILE *fp) +__libc_feof_unlocked (FILE *fp) { CHECK_FILE (fp, EOF); return _IO_feof_unlocked (fp); } -weak_alias (__feof_unlocked, feof_unlocked) -libc_hidden_weak (feof_unlocked) +weak_alias (__libc_feof_unlocked, feof_unlocked)