From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 1 Apr 1998 12:27:00 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~28633
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9f219d99a5b3b29af184bff9afe70aa9ed427a1;p=external%2Fglibc.git

Update.

1998-04-01  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv_simple.c (__gconv_transform_ucs4_utf8): Compute
	number of converted bytes correctly.
---

diff --git a/ChangeLog b/ChangeLog
index 9150147..4a90650 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-04-01  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconv/gconv_simple.c (__gconv_transform_ucs4_utf8): Compute
+	number of converted bytes correctly.
+
 1998-04-01  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
 
 	* sunrpc/clnt_udp.c (clntudp_call): Don't check the xid if
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index 51e4673..6f399cc 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -1,5 +1,5 @@
 /* Simple transformations functions.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -130,7 +130,7 @@ __gconv_transform_ucs4_utf8 (struct gconv_step *step,
 
 	  /* Remember how much we converted.  */
 	  do_write += newinbuf - inbuf;
-	  *inlen -= (newinbuf - inbuf) * sizeof (wchar_t);
+	  *inlen -= newinbuf - inbuf;
 
 	  data->outbufavail += actually;