[git commit future 1/1] use fputwc in putwchar()

Peter S. Mazinger ps.m at gmx.net
Thu Mar 10 12:15:10 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=0089ebe90a0756ba76b0245bcccac36f27945b07
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

use fputwc instead of fputc
add hidden fputwc to avoid jump relocation

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 include/wchar.h       |    1 +
 libc/stdio/fputwc.c   |    2 ++
 libc/stdio/putwchar.c |    5 +----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wchar.h b/include/wchar.h
index aee2b6e..099aa9f 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -656,6 +656,7 @@ extern wint_t getwchar (void);
    These functions are possible cancellation points and therefore not
    marked with __THROW.  */
 extern wint_t fputwc (wchar_t __wc, __FILE *__stream);
+libc_hidden_proto(fputwc)
 extern wint_t putwc (wchar_t __wc, __FILE *__stream);
 
 /* Write a character to stdout.
diff --git a/libc/stdio/fputwc.c b/libc/stdio/fputwc.c
index 7f46f48..b699e9d 100644
--- a/libc/stdio/fputwc.c
+++ b/libc/stdio/fputwc.c
@@ -19,6 +19,7 @@ libc_hidden_def(fputwc_unlocked)
 strong_alias(fputwc_unlocked,putwc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
 strong_alias(fputwc_unlocked,fputwc)
+libc_hidden_def(fputwc)
 strong_alias(fputwc_unlocked,putwc)
 #endif
 
@@ -37,6 +38,7 @@ wint_t fputwc(wchar_t wc, register FILE *stream)
 
 	return retval;
 }
+libc_hidden_def(fputwc)
 
 strong_alias(fputwc,putwc)
 
diff --git a/libc/stdio/putwchar.c b/libc/stdio/putwchar.c
index 3fadb61..96de6a2 100644
--- a/libc/stdio/putwchar.c
+++ b/libc/stdio/putwchar.c
@@ -9,7 +9,6 @@
 
 #ifdef __DO_UNLOCKED
 
-
 wint_t putwchar_unlocked(wchar_t wc)
 {
 	return fputwc_unlocked(wc, stdout);
@@ -21,11 +20,9 @@ strong_alias(putwchar_unlocked,putwchar)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* psm: should this be fputwc? */
-
 wint_t putwchar(wchar_t wc)
 {
-	return fputc(wc, stdout);
+	return fputwc(wc, stdout);
 }
 
 #endif
-- 
1.7.3.4



More information about the uClibc-cvs mailing list