From f1fa8b68f3e7623a3ef86dcd0c7d090ccf0389f5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 15 Apr 1998 17:02:23 +0000 Subject: Update. 1998-04-15 16:41 Ulrich Drepper Don't name internal representation since it might be different from the external form (namely on little endian machines). * iconv/gconv_builtin.h: Add UCS4 support. Change references to UCS4 into references to INTERNAL. * iconv/gconv_simple.c: Implement UCS4<->INTERNAL converters. Add endianess support to UCS functions. Change references to UCS4 into references to INTERNAL. * iconv/gconv_int.h: Change references to UCS4 into references to INTERNAL. * iconv/iconv_prog.c: Don't mention INTERNAL in --list output. * iconvdata/gconv-modules: Change accordingly. * wcsmbs/wcsmbsload.c: Change names to use INTERNAL. * iconv/gconv_simple.c: Adjust input buffer pointer for output buffer overflow. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/euccn.c: Likewise. * iconvdata/eucjp.c: Likewise. * iconvdata/euckr.c: Likewise. * iconvdata/euctw.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso6937.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/8bit-gap.c: Correct access to to_ucs4 array. * iconvdata/8bit-generic.c: Likewise. * iconvdata/TESTS: Add more tests. * sysdeps/i386/bits/byteswap.h: Change to use "=r" when ror is used. 1998-04-15 11:47 Ulrich Drepper * iconvdata/Makefile: Better rules to run tests. * iconvdata/testdata/ISO-8859-1..UTF8: New file. * iconvdata/testdata/ISO-8859-10: Likewise. * iconvdata/testdata/ISO-8859-10..UCS2: Likewise. * iconvdata/testdata/ISO-8859-2: Likewise. * iconvdata/testdata/ISO-8859-2..UCS4: Likewise. * iconvdata/testdata/ISO-8859-2..UTF8: Likewise. * iconvdata/testdata/ISO-8859-3: Likewise. * iconvdata/testdata/ISO-8859-4: Likewise. * iconvdata/testdata/ISO-8859-5: Likewise. * iconvdata/testdata/ISO-8859-6: Likewise. * iconvdata/testdata/ISO-8859-7: Likewise. * iconvdata/testdata/ISO-8859-8: Likewise. * iconvdata/testdata/ISO-8859-9: Likewise. * iconvdata/run-iconv-test.sh: Handle $from..$t file to compare intermediate result (if available). * iconvdata/Makefile: Add rules to run run-iconv-test.sh. (distribute): Add run-iconv-test.sh and testdata/*. * stdlib/testmb.c (main): Simplify mbc array handling. * iconvdata/testdata/ISO-8859-1: New file. --- wcsmbs/wcsmbsload.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wcsmbs') diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index cf854d9125..c7e5651fe6 100644 --- a/wcsmbs/wcsmbsload.c +++ b/wcsmbs/wcsmbsload.c @@ -38,8 +38,8 @@ static struct gconv_step to_wc = modname: NULL, counter: INT_MAX, from_name: "ANSI_X3.4-1968", - to_name: "ISO-10646/UCS4/", - fct: __gconv_transform_ascii_ucs4, + to_name: "#INTERNAL#", + fct: __gconv_transform_ascii_internal, init_fct: NULL, end_fct: NULL, data: NULL @@ -50,9 +50,9 @@ static struct gconv_step to_mb = shlib_handle: NULL, modname: NULL, counter: INT_MAX, - from_name: "ISO-10646/UCS4/", + from_name: "#INTERNAL#", to_name: "ANSI_X3.4-1968", - fct: __gconv_transform_ucs4_ascii, + fct: __gconv_transform_internal_ascii, init_fct: NULL, end_fct: NULL, data: NULL @@ -113,8 +113,8 @@ __wcsmbs_load_conv (const struct locale_data *new_category) /* Get name of charset of the locale. */ charset_name = new_category->values[_NL_ITEM_INDEX(CODESET)].string; - __wcsmbs_gconv_fcts.tomb = getfct (charset_name, "ISO-10646/UCS4/"); - __wcsmbs_gconv_fcts.towc = getfct ("ISO-10646/UCS4/", charset_name); + __wcsmbs_gconv_fcts.tomb = getfct (charset_name, "#INTERNAL#"); + __wcsmbs_gconv_fcts.towc = getfct ("#INTERNAL#", charset_name); /* If any of the conversion functions is not available we don't use any since this would mean we cannot convert back and -- cgit 1.4.1