From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 043943858C78; Tue, 15 Mar 2022 18:41:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 043943858C78 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_ferror_unlocked instead of __ferror_unlocked X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: b958086d189c9b177dc1ffa0e3c6a6a6c3eb932f X-Git-Newrev: 95df46e294bb42bcbaf16137926ffe9ac2993700 Message-Id: <20220315184143.043943858C78@sourceware.org> Date: Tue, 15 Mar 2022 18:41:43 +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: Tue, 15 Mar 2022 18:41:43 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=95df46e294bb42bcbaf16137926ffe9ac2993700 commit 95df46e294bb42bcbaf16137926ffe9ac2993700 Author: Adhemerval Zanella Date: Mon Mar 14 15:14:36 2022 -0300 libio: Use __libc_ferror_unlocked instead of __ferror_unlocked Internal __ferror_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/ferror_u.c | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index f1509888d7..edb8f12e8a 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -242,8 +242,7 @@ libc_hidden_proto (fputs_unlocked) extern __typeof (fputs_unlocked) __fputs_unlocked; libc_hidden_proto (__fputs_unlocked) extern __typeof (feof_unlocked) __libc_feof_unlocked; -libc_hidden_proto (ferror_unlocked) -extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden; +extern __typeof (ferror_unlocked) __libc_ferror_unlocked; libc_hidden_proto (getc_unlocked) libc_hidden_proto (fputc_unlocked) libc_hidden_proto (putc_unlocked) @@ -269,13 +268,13 @@ __feof_unlocked (FILE *__stream) return __feof_unlocked_body (__stream); } -# ifdef __USE_EXTERN_INLINES -__extern_inline int -__NTH (__ferror_unlocked (FILE *__stream)) +static inline int +__ferror_unlocked (FILE *__stream) { return __ferror_unlocked_body (__stream); } +# ifdef __USE_EXTERN_INLINES __extern_inline int __getc_unlocked (FILE *__fp) { diff --git a/libio/ferror_u.c b/libio/ferror_u.c index edba404d32..ea2a97db8f 100644 --- a/libio/ferror_u.c +++ b/libio/ferror_u.c @@ -30,10 +30,9 @@ #undef ferror_unlocked int -__ferror_unlocked (FILE *fp) +__libc_ferror_unlocked (FILE *fp) { CHECK_FILE (fp, EOF); return _IO_ferror_unlocked (fp); } weak_alias (__ferror_unlocked, ferror_unlocked) -libc_hidden_weak (ferror_unlocked)