diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | include/stdio.h | 9 | ||||
| -rw-r--r-- | libio/fputc_u.c | 1 | ||||
| -rw-r--r-- | libio/putc_u.c | 4 | ||||
| -rw-r--r-- | misc/syslog.c | 4 |
5 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index d9249a1535..64d0cfaa7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,19 @@ [BZ #15105] [BZ #19463] + * libio/fputc_u.c (fputc_unlocked): Use libc_hidden_def. + * libio/putc_u.c (putc_unlocked): Rename to __putc_unlocked and + define as weak alias of __putc_unlocked. Use libc_hidden_weak. + * include/stdio.h [!_ISOMAC] (fputc_unlocked): Use + libc_hidden_proto. + [!_ISOMAC] (putc_unlocked): Likewise. + [!_ISOMAC] (__putc_unlocked): Declare as hidden function, and + define inline if [__USE_EXTERN_INLINES]. + * misc/syslog.c (__vsyslog_chk): Call __putc_unlocked instead of + putc_unlocked. + + [BZ #15105] + [BZ #19463] * libio/getc_u.c (getc_unlocked): Use libc_hidden_weak. * include/stdio.h [!_ISOMAC] (__getc_unlocked): Use attribute_hidden, and define inline if [__USE_EXTERN_INLINES]. diff --git a/include/stdio.h b/include/stdio.h index 937235f59a..aac5acdb2f 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -188,6 +188,9 @@ extern __typeof (feof_unlocked) __feof_unlocked attribute_hidden; libc_hidden_proto (ferror_unlocked) extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden; libc_hidden_proto (getc_unlocked) +libc_hidden_proto (fputc_unlocked) +libc_hidden_proto (putc_unlocked) +extern __typeof (putc_unlocked) __putc_unlocked attribute_hidden; libc_hidden_proto (fmemopen) /* The prototype needs repeating instead of using __typeof to use __THROW in C++ tests. */ @@ -226,6 +229,12 @@ __getc_unlocked (FILE *__fp) { return __getc_unlocked_body (__fp); } + +__extern_inline int +__putc_unlocked (int __c, FILE *__stream) +{ + return __putc_unlocked_body (__c, __stream); +} # endif # endif /* not _ISOMAC */ diff --git a/libio/fputc_u.c b/libio/fputc_u.c index abe07f33d3..25e2035cf4 100644 --- a/libio/fputc_u.c +++ b/libio/fputc_u.c @@ -35,3 +35,4 @@ fputc_unlocked (int c, _IO_FILE *fp) CHECK_FILE (fp, EOF); return _IO_putc_unlocked (c, fp); } +libc_hidden_def (fputc_unlocked) diff --git a/libio/putc_u.c b/libio/putc_u.c index 61ca95beda..2d122a6d23 100644 --- a/libio/putc_u.c +++ b/libio/putc_u.c @@ -21,8 +21,10 @@ #undef putc_unlocked int -putc_unlocked (int c, _IO_FILE *fp) +__putc_unlocked (int c, _IO_FILE *fp) { CHECK_FILE (fp, EOF); return _IO_putc_unlocked (c, fp); } +weak_alias (__putc_unlocked, putc_unlocked) +libc_hidden_weak (putc_unlocked) diff --git a/misc/syslog.c b/misc/syslog.c index 2b6bd373bc..644dbe80ec 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -207,8 +207,8 @@ __vsyslog_chk(int pri, int flag, const char *fmt, va_list ap) fprintf (f, "[%d]", (int) __getpid ()); if (LogTag != NULL) { - putc_unlocked (':', f); - putc_unlocked (' ', f); + __putc_unlocked (':', f); + __putc_unlocked (' ', f); } /* Restore errno for %m format. */ |