From d16a56306d63b4d94412b479a8ea83463a3514ab Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 20 Jul 2016 22:05:59 +0200 Subject: Consolidate wctomb/mbtowc calls for POSIX-1.2008 - Remove charset parameter from low level __foo_wctomb/__foo_mbtowc calls. - Instead, create array of function for ISO and Windows codepages to point to function which does not require to evaluate the charset string on each call. Create matching helper functions. I.e., __iso_wctomb, __iso_mbtowc, __cp_wctomb and __cp_mbtowc are functions returning the right function pointer now. - Create __WCTOMB/__MBTOWC macros utilizing per-reent locale and replace calls to __wctomb/__mbtowc with calls to __WCTOMB/__MBTOWC. - Drop global __wctomb/__mbtowc vars. - Utilize aforementioned changes in Cygwin to get rid of charset in other, calling functions and simplify the code. - In Cygwin restrict global cygheap locale info to the job performed by internal_setlocale. Use UTF-8 instead of ASCII on the fly in internal conversion functions. - In Cygwin dll_entry, make sure to initialize a TLS area with a NULL _REENT->_locale pointer. Add comment to explain why. Signed-off by: Corinna Vinschen --- newlib/libc/stdlib/btowc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'newlib/libc/stdlib/btowc.c') diff --git a/newlib/libc/stdlib/btowc.c b/newlib/libc/stdlib/btowc.c index 354a1d6e1..7605ce6b6 100644 --- a/newlib/libc/stdlib/btowc.c +++ b/newlib/libc/stdlib/btowc.c @@ -23,8 +23,7 @@ btowc (int c) _REENT_CHECK_MISC(_REENT); - retval = __mbtowc (_REENT, &pwc, (const char *) &b, 1, - __locale_charset (), &mbs); + retval = __MBTOWC (_REENT, &pwc, (const char *) &b, 1, &mbs); if (retval != 0 && retval != 1) return WEOF; -- cgit v1.2.3