From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 689B838344E6; Thu, 9 Jun 2022 13:16:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 689B838344E6 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] stdio: Refactor getc_unlocked, putc_unlocked, and fputc_unlocked X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 383cd72a88858f0dc6b0af438813feaccf114d89 X-Git-Newrev: e771c8025b09465370a56814740469b0d8d993dc Message-Id: <20220609131656.689B838344E6@sourceware.org> Date: Thu, 9 Jun 2022 13:16:56 +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 13:16:56 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e771c8025b09465370a56814740469b0d8d993dc commit e771c8025b09465370a56814740469b0d8d993dc Author: Adhemerval Zanella 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)