about summary refs log tree commit diff
path: root/wcsmbs/mbsnrtowcs.c
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs/mbsnrtowcs.c')
-rw-r--r--wcsmbs/mbsnrtowcs.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index 46a718b3f5..790e777a6c 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -65,21 +65,17 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
     {
       wchar_t buf[64];		/* Just an arbitrary size.  */
       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;
     }