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] stdio: Refactor getc_unlocked, putc_unlocked, and fputc_unlocked Date: Thu, 12 May 2022 19:33:51 +0000 (GMT) [thread overview] Message-ID: <20220512193351.9D7703886C4B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b2c6aa55b2da238e94db937caccb1dec0f6aaf27 commit b2c6aa55b2da238e94db937caccb1dec0f6aaf27 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Mon Mar 14 15:34:50 2022 -0300 stdio: Refactor getc_unlocked, putc_unlocked, and fputc_unlocked Diff: --- include/stdio.h | 13 ++++--------- libio/fputc_u.c | 1 - libio/getc_u.c | 7 +++---- libio/putc_u.c | 5 ++--- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index f1e388523b..561c9b14bb 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -169,7 +169,6 @@ extern void __funlockfile (FILE *__stream) attribute_hidden; possible. */ extern int __ftrylockfile (FILE *__stream); -extern int __getc_unlocked (FILE *__fp) attribute_hidden; extern wint_t __getwc_unlocked (FILE *__fp); extern int __fxprintf (FILE *__fp, const char *__fmt, ...) @@ -244,10 +243,8 @@ extern __typeof (fputs_unlocked) __fputs_unlocked; libc_hidden_proto (__fputs_unlocked) extern __typeof (feof_unlocked) __libc_feof_unlocked; extern __typeof (ferror_unlocked) __libc_ferror_unlocked; -libc_hidden_proto (getc_unlocked) -libc_hidden_proto (fputc_unlocked) -libc_hidden_proto (putc_unlocked) -extern __typeof (putc_unlocked) __putc_unlocked attribute_hidden; +extern __typeof (getc_unlocked) __libc_getc_unlocked; +extern __typeof (putc_unlocked) __libc_putc_unlocked; libc_hidden_proto (fmemopen) /* The prototype needs repeating instead of using __typeof to use __THROW in C++ tests. */ @@ -275,19 +272,17 @@ __ferror_unlocked (FILE *__stream) return __ferror_unlocked_body (__stream); } -# ifdef __USE_EXTERN_INLINES -__extern_inline int +static inline int __getc_unlocked (FILE *__fp) { return __getc_unlocked_body (__fp); } -__extern_inline int +static inline int __putc_unlocked (int __c, FILE *__stream) { return __putc_unlocked_body (__c, __stream); } -# endif extern __typeof (renameat) __renameat; libc_hidden_proto (__renameat) diff --git a/libio/fputc_u.c b/libio/fputc_u.c index a479c8bf23..0d5998a728 100644 --- a/libio/fputc_u.c +++ b/libio/fputc_u.c @@ -35,4 +35,3 @@ fputc_unlocked (int c, FILE *fp) CHECK_FILE (fp, EOF); return _IO_putc_unlocked (c, fp); } -libc_hidden_def (fputc_unlocked) diff --git a/libio/getc_u.c b/libio/getc_u.c index 6757a1795e..e53ef66735 100644 --- a/libio/getc_u.c +++ b/libio/getc_u.c @@ -30,12 +30,11 @@ #undef getc_unlocked int -__getc_unlocked (FILE *fp) +__libc_getc_unlocked (FILE *fp) { CHECK_FILE (fp, EOF); return _IO_getc_unlocked (fp); } -weak_alias (__getc_unlocked, getc_unlocked) -libc_hidden_weak (getc_unlocked) -weak_alias (__getc_unlocked, fgetc_unlocked) +weak_alias (__libc_getc_unlocked, getc_unlocked) +weak_alias (__libc_getc_unlocked, fgetc_unlocked) diff --git a/libio/putc_u.c b/libio/putc_u.c index e518685ca2..c6936b57bc 100644 --- a/libio/putc_u.c +++ b/libio/putc_u.c @@ -21,10 +21,9 @@ #undef putc_unlocked int -__putc_unlocked (int c, FILE *fp) +__libc_putc_unlocked (int c, FILE *fp) { CHECK_FILE (fp, EOF); return _IO_putc_unlocked (c, fp); } -weak_alias (__putc_unlocked, putc_unlocked) -libc_hidden_weak (putc_unlocked) +weak_alias (__libc_putc_unlocked, putc_unlocked)
next reply other threads:[~2022-05-12 19:33 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-12 19:33 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:20 Adhemerval Zanella 2022-05-10 18:24 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:30 Adhemerval Zanella 2022-03-16 18:04 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=20220512193351.9D7703886C4B@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).