diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-07-20 22:05:59 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-08-15 10:56:57 +0200 |
| commit | d16a56306d63b4d94412b479a8ea83463a3514ab (patch) | |
| tree | b37c2954976f314628637e660e039f1be4034b1c /newlib/libc/stdio/vfprintf.c | |
| parent | 88208d3735821df0f5a66c5f8781282a7f5bf284 (diff) | |
| download | cygnal-d16a56306d63b4d94412b479a8ea83463a3514ab.tar.gz cygnal-d16a56306d63b4d94412b479a8ea83463a3514ab.tar.bz2 cygnal-d16a56306d63b4d94412b479a8ea83463a3514ab.zip | |
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/stdio/vfprintf.c')
| -rw-r--r-- | newlib/libc/stdio/vfprintf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index 6430edf2c..ed92bb2f9 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -910,8 +910,8 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap), for (;;) { cp = fmt; #ifdef _MB_CAPABLE - while ((n = __mbtowc (data, &wc, fmt, MB_CUR_MAX, - __locale_charset (), &state)) != 0) { + while ((n = __MBTOWC (data, &wc, fmt, MB_CUR_MAX, + &state)) != 0) { if (n < 0) { /* Wave invalid chars through. */ memset (&state, 0, sizeof state); @@ -2079,8 +2079,7 @@ _DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt), while (*fmt && n >= numargs) { # ifdef _MB_CAPABLE - while ((nbytes = __mbtowc (data, &wc, fmt, MB_CUR_MAX, - __locale_charset (), &wc_state)) > 0) + while ((nbytes = __MBTOWC (data, &wc, fmt, MB_CUR_MAX, &wc_state)) > 0) { fmt += nbytes; if (wc == '%') |