diff options
Diffstat (limited to 'newlib/libc/stdlib/wcstombs.c')
| -rw-r--r-- | newlib/libc/stdlib/wcstombs.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c index 83e48da93..ca99f2ea1 100644 --- a/newlib/libc/stdlib/wcstombs.c +++ b/newlib/libc/stdlib/wcstombs.c @@ -17,12 +17,12 @@ TRAD_SYNOPSIS size_t <[n]>; DESCRIPTION -When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming +When MB_CAPABLE is not defined, this is a minimal ANSI-conforming implementation of <<wcstombs>>. In this case, all wide-characters are expected to represent single bytes and so are converted simply by casting to char. -When _MB_CAPABLE is defined, this routine calls <<_wcstombs_r>> to perform +When MB_CAPABLE is defined, this routine calls <<_wcstombs_r>> to perform the conversion, passing a state variable to allow state dependent decoding. The result is based on the locale setting which may be restricted to a defined set of locales. @@ -30,7 +30,7 @@ be restricted to a defined set of locales. RETURNS This implementation of <<wcstombs>> returns <<0>> if <[s]> is <<NULL>> or is the empty string; -it returns <<-1>> if _MB_CAPABLE and one of the +it returns <<-1>> if MB_CAPABLE and one of the wide-char characters does not represent a valid multi-byte character; otherwise it returns the minimum of: <<n>> or the number of bytes that are transferred to <<s>>, not including the @@ -50,9 +50,7 @@ effects vary with the locale. #ifndef _REENT_ONLY -#include <newlib.h> #include <stdlib.h> -#include <wchar.h> size_t _DEFUN (wcstombs, (s, pwcs, n), @@ -60,24 +58,23 @@ _DEFUN (wcstombs, (s, pwcs, n), const wchar_t *pwcs _AND size_t n) { -#ifdef _MB_CAPABLE - mbstate_t state; - state.__count = 0; - - return _wcstombs_r (_REENT, s, pwcs, n, &state); -#else /* not _MB_CAPABLE */ - int count = 0; - - if (n != 0) { - do { - if ((*s++ = (char) *pwcs++) == 0) - break; - count++; - } while (--n != 0); - } - - return count; -#endif /* not _MB_CAPABLE */ +#ifdef MB_CAPABLE + int state = 0; + + return _wcstombs_r (_REENT, s, pwcs, n, &state); +#else /* not MB_CAPABLE */ + int count = 0; + + if (n != 0) { + do { + if ((*s++ = (char) *pwcs++) == 0) + break; + count++; + } while (--n != 0); + } + + return count; +#endif /* not MB_CAPABLE */ } #endif /* !_REENT_ONLY */ |