aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--iconv/gconv_simple.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9150147811..4a906502fd 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 51e4673b2d..6f399ccd1a 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;