diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-11-18 09:49:57 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-11-18 09:49:57 +0000 |
| commit | b4fee5273ece15d709b8e1e7149f92665a24df3e (patch) | |
| tree | e50e4dbfa0e82b5de3e2115b990cb46782f1babd /newlib/libc/stdio/vfscanf.c | |
| parent | 46471257e90bdc2c46e03a6371a329f8cac34d0c (diff) | |
| download | cygnal-b4fee5273ece15d709b8e1e7149f92665a24df3e.tar.gz cygnal-b4fee5273ece15d709b8e1e7149f92665a24df3e.tar.bz2 cygnal-b4fee5273ece15d709b8e1e7149f92665a24df3e.zip | |
* libc/stdio/vfprintf.c: Include ../stdlib/local.h. Replace call to
_mbtowc_r with direct call to __mbtowc.
* libc/stdio/vfscanf.c: Ditto.
* libc/stdlib/btowc.c: Include local.h. Replace call to _mbtowc_r
with direct call to __mbtowc.
* libc/stdlib/mblen.c: Ditto.
* libc/stdlib/mblen_r.c: Ditto.
* libc/stdlib/mbrtowc.c: Ditto.
* libc/stdlib/mbstowcs_r.c: Ditto.
* libc/stdlib/mbtowc.c: Ditto.
* libc/stdlib/wcrtomb.c: Include local.h. Replace call to _wctomb_r
with direct call to __wctomb.
* libc/stdlib/wcsnrtombs.c: Ditto.
(_wcsnrtombs_r): Ditto.
* libc/stdlib/wcstombs_r.c: Ditto.
* libc/stdlib/wctob.c: Ditto.
* libc/stdlib/wctomb.c: Ditto.
* libc/stdlib/mbrtowc.c (mbrtowc): Implement independently from
_mbrtowc_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are
defined.
* libc/stdlib/wcrtomb.c (wcrtomb): Implement independently from
_wcrtomb_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are
defined.
* libc/stdlib/mbtowc_r.c (__utf8_mbtowc): Drop unnecessary test for
ch >= 0.
Diffstat (limited to 'newlib/libc/stdio/vfscanf.c')
| -rw-r--r-- | newlib/libc/stdio/vfscanf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index b24c9fb84..065dc3e89 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -122,6 +122,7 @@ Supporting OS subroutines required: #include <stdarg.h> #include <errno.h> #include "local.h" +#include "../stdlib/local.h" #ifdef INTEGER_ONLY #define VFSCANF vfiscanf @@ -506,7 +507,8 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap), wc = *fmt; #else memset (&state, '\0', sizeof (state)); - nbytes = _mbtowc_r (rptr, &wc, fmt, MB_CUR_MAX, &state); + nbytes = __mbtowc (rptr, &wc, fmt, MB_CUR_MAX, __locale_charset (), + &state); #endif fmt += nbytes; if (wc == 0) |