From 855dca36fe7aa348dc56996385fbbb77fbf3e83d Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 3 Dec 2005 23:36:38 +0000 Subject: Rename newly created __libc_x (reserved for libpthread overwrites) w/ x_internal, do not use cascading aliases --- libc/stdio/__fsetlocking.c | 4 ++-- libc/stdio/_stdio.h | 4 ++-- libc/stdio/fgetc.c | 12 ++++++------ libc/stdio/fgets.c | 4 +--- libc/stdio/fputc.c | 12 ++++++------ libc/stdio/puts.c | 4 +--- 6 files changed, 18 insertions(+), 22 deletions(-) (limited to 'libc/stdio') diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c index 77690e269..5b6070cc3 100644 --- a/libc/stdio/__fsetlocking.c +++ b/libc/stdio/__fsetlocking.c @@ -15,7 +15,7 @@ * glibc treats invalid locking_mode args as FSETLOCKING_INTERNAL. */ -int attribute_hidden __libc_fsetlocking(FILE *stream, int locking_mode) +int attribute_hidden __fsetlocking_internal(FILE *stream, int locking_mode) { #ifdef __UCLIBC_HAS_THREADS__ int current = 1 + (stream->__user_locking & 1); @@ -44,4 +44,4 @@ int attribute_hidden __libc_fsetlocking(FILE *stream, int locking_mode) #endif } -strong_alias(__libc_fsetlocking,__fsetlocking) +strong_alias(__fsetlocking_internal,__fsetlocking) diff --git a/libc/stdio/_stdio.h b/libc/stdio/_stdio.h index e5d3c0787..85a00bb95 100644 --- a/libc/stdio/_stdio.h +++ b/libc/stdio/_stdio.h @@ -358,7 +358,7 @@ extern size_t __fwrite_unlocked(const void *__restrict ptr, size_t size, extern size_t __fread_unlocked(void *__restrict ptr, size_t size, size_t nmemb, FILE *__restrict stream) attribute_hidden; -extern int __libc_fputc_unlocked(int c, FILE *stream) attribute_hidden; +extern int __fputc_unlocked_internal(int c, FILE *stream) attribute_hidden; extern int __fflush_unlocked(FILE *stream) attribute_hidden; @@ -368,7 +368,7 @@ extern void __clearerr_unlocked(FILE *stream); extern int __feof_unlocked(FILE *stream); extern int __ferror_unlocked(FILE *stream); -extern int __libc_fgetc_unlocked(FILE *stream) attribute_hidden; +extern int __fgetc_unlocked_internal(FILE *stream) attribute_hidden; extern char *__fgets_unlocked(char *__restrict s, int n, FILE * __restrict stream) attribute_hidden; diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c index 78fca8422..be9322714 100644 --- a/libc/stdio/fgetc.c +++ b/libc/stdio/fgetc.c @@ -14,7 +14,7 @@ #ifdef __DO_UNLOCKED -int attribute_hidden __libc_fgetc_unlocked(FILE *stream) +int attribute_hidden __fgetc_unlocked_internal(FILE *stream) { __STDIO_STREAM_VALIDATE(stream); @@ -69,12 +69,12 @@ int attribute_hidden __libc_fgetc_unlocked(FILE *stream) return EOF; } -strong_alias(__libc_fgetc_unlocked,__fgetc_unlocked) -weak_alias(__fgetc_unlocked,fgetc_unlocked) -weak_alias(__fgetc_unlocked,getc_unlocked) +strong_alias(__fgetc_unlocked_internal,__fgetc_unlocked) +weak_alias(__fgetc_unlocked_internal,fgetc_unlocked) +weak_alias(__fgetc_unlocked_internal,getc_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -weak_alias(__fgetc_unlocked,fgetc) -weak_alias(__fgetc_unlocked,getc) +weak_alias(__fgetc_unlocked_internal,fgetc) +weak_alias(__fgetc_unlocked_internal,getc) #endif #elif defined __UCLIBC_HAS_THREADS__ diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c index 743a2ea54..52c856f35 100644 --- a/libc/stdio/fgets.c +++ b/libc/stdio/fgets.c @@ -5,8 +5,6 @@ * Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details. */ -#define __fgetc_unlocked __libc_fgetc_unlocked - #include "_stdio.h" #ifdef __DO_UNLOCKED @@ -36,7 +34,7 @@ char attribute_hidden *__fgets_unlocked(char *__restrict s, int n, break; } } else { - if ((c = __fgetc_unlocked(stream)) == EOF) { + if ((c = __fgetc_unlocked_internal(stream)) == EOF) { if (__FERROR_UNLOCKED(stream)) { goto ERROR; } diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c index 46ebb163c..b319263a1 100644 --- a/libc/stdio/fputc.c +++ b/libc/stdio/fputc.c @@ -14,7 +14,7 @@ #ifdef __DO_UNLOCKED -int attribute_hidden __libc_fputc_unlocked(int c, register FILE *stream) +int attribute_hidden __fputc_unlocked_internal(int c, register FILE *stream) { __STDIO_STREAM_VALIDATE(stream); @@ -69,12 +69,12 @@ int attribute_hidden __libc_fputc_unlocked(int c, register FILE *stream) return EOF; } -strong_alias(__libc_fputc_unlocked,__fputc_unlocked) -weak_alias(__fputc_unlocked,fputc_unlocked) -weak_alias(__fputc_unlocked,putc_unlocked) +strong_alias(__fputc_unlocked_internal,__fputc_unlocked) +weak_alias(__fputc_unlocked_internal,fputc_unlocked) +weak_alias(__fputc_unlocked_internal,putc_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -weak_alias(__fputc_unlocked,fputc) -weak_alias(__fputc_unlocked,putc) +weak_alias(__fputc_unlocked_internal,fputc) +weak_alias(__fputc_unlocked_internal,putc) #endif #elif defined __UCLIBC_HAS_THREADS__ diff --git a/libc/stdio/puts.c b/libc/stdio/puts.c index 37ae243bf..3a510325b 100644 --- a/libc/stdio/puts.c +++ b/libc/stdio/puts.c @@ -5,8 +5,6 @@ * Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details. */ -#define __fputc_unlocked __libc_fputc_unlocked - #include "_stdio.h" int puts(register const char * __restrict s) @@ -24,7 +22,7 @@ int puts(register const char * __restrict s) /* Note: Nonportable as fputs need only return nonnegative on success. */ if ((n = __fputs_unlocked(s, stream)) != EOF) { ++n; - if (__fputc_unlocked('\n', stream) == EOF) { + if (__fputc_unlocked_internal('\n', stream) == EOF) { n = EOF; } } -- cgit v1.2.3