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/mbrtowc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'newlib/libc/stdlib/mbrtowc.c') diff --git a/newlib/libc/stdlib/mbrtowc.c b/newlib/libc/stdlib/mbrtowc.c index 550aaff99..69e3acb62 100644 --- a/newlib/libc/stdlib/mbrtowc.c +++ b/newlib/libc/stdlib/mbrtowc.c @@ -26,9 +26,9 @@ _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps), #endif if (s == NULL) - retval = __mbtowc (ptr, NULL, "", 1, __locale_charset (), ps); + retval = __MBTOWC (ptr, NULL, "", 1, ps); else - retval = __mbtowc (ptr, pwc, s, n, __locale_charset (), ps); + retval = __MBTOWC (ptr, pwc, s, n, ps); if (retval == -1) { @@ -63,9 +63,9 @@ _DEFUN (mbrtowc, (pwc, s, n, ps), #endif if (s == NULL) - retval = __mbtowc (reent, NULL, "", 1, __locale_charset (), ps); + retval = __MBTOWC (reent, NULL, "", 1, ps); else - retval = __mbtowc (reent, pwc, s, n, __locale_charset (), ps); + retval = __MBTOWC (reent, pwc, s, n, ps); if (retval == -1) { -- cgit v1.2.3