From b4fee5273ece15d709b8e1e7149f92665a24df3e Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 18 Nov 2009 09:49:57 +0000 Subject: * 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. --- newlib/libc/stdlib/wcsnrtombs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'newlib/libc/stdlib/wcsnrtombs.c') diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c index a8e6901a3..5f885a454 100644 --- a/newlib/libc/stdlib/wcsnrtombs.c +++ b/newlib/libc/stdlib/wcsnrtombs.c @@ -99,6 +99,7 @@ PORTABILITY #include #include #include +#include "local.h" size_t _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps), @@ -134,7 +135,7 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps), { int count = ps->__count; wint_t wch = ps->__value.__wch; - int bytes = _wcrtomb_r (r, buff, *pwcs, ps); + int bytes = __wctomb (r, buff, *pwcs, __locale_charset (), ps); if (bytes == -1) { r->_errno = EILSEQ; @@ -160,7 +161,7 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps), } else { - /* not enough room, we must back up state to before _wctomb_r call */ + /* not enough room, we must back up state to before __wctomb call */ ps->__count = count; ps->__value.__wch = wch; len = 0; -- cgit v1.2.3