diff options
Diffstat (limited to 'wcsmbs/mbsrtowcs.c')
| -rw-r--r-- | wcsmbs/mbsrtowcs.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index 9172fd9ede..5043fd146e 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -58,21 +58,17 @@ __mbsrtowcs (dst, src, len, ps) wchar_t buf[64]; /* Just an arbitrary size. */ const char *srcend = *src + strlen (*src) + 1; const char *inbuf = *src; - size_t written; data.outbuf = (char *) buf; data.outbufend = data.outbuf + sizeof (buf); do - { - status = (*__wcsmbs_gconv_fcts.towc->fct) (__wcsmbs_gconv_fcts.towc, - &data, &inbuf, srcend, - &written, 0); - result += written; - } + status = (*__wcsmbs_gconv_fcts.towc->fct) (__wcsmbs_gconv_fcts.towc, + &data, &inbuf, srcend, + &result, 0); while (status == GCONV_FULL_OUTPUT); if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT) - && buf[written - 1] == L'\0') + && ((wchar_t *) data.outbuf)[-1] == L'\0') /* Don't count the NUL character in. */ --result; } |