diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2016-07-20 23:05:59 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2016-08-15 11:56:57 +0300 |
commit | d16a56306d63b4d94412b479a8ea83463a3514ab (patch) | |
tree | b37c2954976f314628637e660e039f1be4034b1c /newlib/libc/ctype | |
parent | 88208d3735821df0f5a66c5f8781282a7f5bf284 (diff) |
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 <corinna@vinschen.de>
Diffstat (limited to 'newlib/libc/ctype')
-rw-r--r-- | newlib/libc/ctype/isprint.c | 2 | ||||
-rw-r--r-- | newlib/libc/ctype/local.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/newlib/libc/ctype/isprint.c b/newlib/libc/ctype/isprint.c index 87254f4bc..172a2333b 100644 --- a/newlib/libc/ctype/isprint.c +++ b/newlib/libc/ctype/isprint.c @@ -56,6 +56,6 @@ _DEFUN(isgraph,(c),int c) int _DEFUN(isprint,(c),int c) { - return(__ctype_ptr__[c+1] & (_P|_U|_L|_N|_B)); + return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N|_B)); } diff --git a/newlib/libc/ctype/local.h b/newlib/libc/ctype/local.h index 1a16520a7..b3788e218 100644 --- a/newlib/libc/ctype/local.h +++ b/newlib/libc/ctype/local.h @@ -1,6 +1,7 @@ /* wctrans constants */ #include <_ansi.h> +#include "../locale/setlocale.h" /* valid values for wctrans_t */ #define WCT_TOLOWER 1 @@ -20,8 +21,6 @@ #define WC_UPPER 11 #define WC_XDIGIT 12 -extern char *__locale_charset(_NOARGS); - /* internal function to translate JP to Unicode */ #ifdef __CYGWIN__ /* Under Cygwin, the incoming wide character is already given in UTF due |