aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--iconv/gconv_open.c5
-rw-r--r--iconv/iconv_prog.c2
-rw-r--r--localedata/ChangeLog6
4 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c35687e..3870200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-30 Yong Li <yong.li@asu.edu>
+
+ * iconv/gconv_open.c (__gconv_open): Fix the variable used to
+ set result->__data[cnt].__flags.
+ * iconv/iconv_prog.c (main): Correct error handling method name.
+
2001-01-29 Ben Collins <bcollins@debian.org>
* sysdeps/sparc/fpu/fraiseexcpt.c: Include <float.h>.
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index a84ed2f..9deeb53 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -35,7 +35,6 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
__gconv_t result = NULL;
size_t cnt = 0;
int res;
- int conv_flags = 0;
const char *errhand;
const char *ignore;
struct trans_struct *trans = NULL;
@@ -247,7 +246,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
output buffer. */
if (cnt < nsteps - 1)
{
- result->__data[cnt].__flags = conv_flags;
+ result->__data[cnt].__flags = flags;
/* Allocate the buffer. */
size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to);
@@ -265,7 +264,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
else
{
/* Handle the last entry. */
- result->__data[cnt].__flags = conv_flags | __GCONV_IS_LAST;
+ result->__data[cnt].__flags = flags | __GCONV_IS_LAST;
break;
}
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index a6e4cd3..8776192 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -168,7 +168,7 @@ main (int argc, char *argv[])
cp = mempcpy (newp, to_code, errhand - to_code);
while (nslash-- > 0)
*cp++ = '/';
- memcpy (cp, "NEEDED", sizeof ("NEEDED"));
+ memcpy (cp, "IGNORE", sizeof ("IGNORE"));
to_code = newp;
}
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index d9bdbc7..7a48337 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-30 Ulrich Drepper <drepper@redhat.com>
+
+ * locales/fi_FI: Remove FIXME comments.
+ * locales/sv_FI: Likewise.
+ Patch by Marko Myllynen <myllynen@lut.fi>.
+
2001-01-23 Jakub Jelinek <jakub@redhat.com>
* locales/cs_CZ (yesexpr, noexpr): Add caret prefix.