public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] libio: Use __libc_feof_unlocked instead of __feof_unlocked Date: Tue, 10 May 2022 18:24:08 +0000 (GMT) [thread overview] Message-ID: <20220510182408.A10663857823@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=58815a406706f7d0a83dab9f42c000c6f1fadef6 commit 58815a406706f7d0a83dab9f42c000c6f1fadef6 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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)
next reply other threads:[~2022-05-10 18:24 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-10 18:24 Adhemerval Zanella [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-06-09 21:20 Adhemerval Zanella 2022-06-09 13:16 Adhemerval Zanella 2022-06-03 14:06 Adhemerval Zanella 2022-05-13 14:19 Adhemerval Zanella 2022-05-12 19:33 Adhemerval Zanella 2022-04-29 14:04 Adhemerval Zanella 2022-04-04 12:54 Adhemerval Zanella 2022-03-31 19:06 Adhemerval Zanella 2022-03-29 20:29 Adhemerval Zanella 2022-03-16 18:03 Adhemerval Zanella 2022-03-15 18:41 Adhemerval Zanella
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220510182408.A10663857823@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).