diff options
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/euc-jp.c | 10 | ||||
| -rw-r--r-- | iconvdata/sjis.c | 20 | ||||
| -rw-r--r-- | iconvdata/tst-table-from.c | 4 |
3 files changed, 13 insertions, 21 deletions
diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c index 1a638994a3..3c55e440b2 100644 --- a/iconvdata/euc-jp.c +++ b/iconvdata/euc-jp.c @@ -63,12 +63,12 @@ else \ { \ /* Two or more byte character. First test whether the next \ - character is also available. */ \ + byte is also available. */ \ int ch2; \ \ if (__builtin_expect (inptr + 1 >= inend, 0)) \ { \ - /* The second character is not available. Store the \ + /* The second byte is not available. Store the \ intermediate result. */ \ result = __GCONV_INCOMPLETE_INPUT; \ break; \ @@ -104,6 +104,10 @@ result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ + \ + ++inptr; \ + ++*irreversible; \ + continue; \ } \ \ inptr += 2; \ @@ -143,7 +147,7 @@ break; \ } \ \ - inptr += 2; \ + ++inptr; \ ++*irreversible; \ continue; \ } \ diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c index 3a19642c83..6f536461ec 100644 --- a/iconvdata/sjis.c +++ b/iconvdata/sjis.c @@ -1,5 +1,5 @@ /* Mapping tables for SJIS handling. - Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1997-2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -22,18 +22,6 @@ #include <stdint.h> #include <wchar.h> -static const uint32_t halfkana_to_ucs4[] = -{ - 0xff61, 0xff62, 0xff63, 0xff64, 0xff65, 0xff66, 0xff67, 0xff68, - 0xff69, 0xff6a, 0xff6b, 0xff6c, 0xff6d, 0xff6e, 0xff6f, 0xff70, - 0xff71, 0xff72, 0xff73, 0xff74, 0xff75, 0xff76, 0xff77, 0xff78, - 0xff79, 0xff7a, 0xff7b, 0xff7c, 0xff7d, 0xff7e, 0xff7f, 0xff80, - 0xff81, 0xff82, 0xff83, 0xff84, 0xff85, 0xff86, 0xff87, 0xff88, - 0xff89, 0xff8a, 0xff8b, 0xff8c, 0xff8d, 0xff8e, 0xff8f, 0xff90, - 0xff91, 0xff92, 0xff93, 0xff94, 0xff95, 0xff96, 0xff97, 0xff98, - 0xff99, 0xff9a, 0xff9b, 0xff9c, 0xff9d, 0xff9e, 0xff9f -}; - /* The following table can be generated from the file unix/mappings/eastasia/jis/shiftjis.txt @@ -4357,7 +4345,7 @@ static const char from_ucs4_extra[0x100][2] = ++inptr; \ else if (ch >= 0xa1 && ch <= 0xdf) \ { \ - ch = halfkana_to_ucs4[ch - 0xa1]; \ + ch += 0xfec0; \ ++inptr; \ } \ else if (__builtin_expect (ch > 0xea, 0) \ @@ -4378,14 +4366,14 @@ static const char from_ucs4_extra[0x100][2] = } \ else \ { \ - /* Two-byte character. First test whether the next character \ + /* Two-byte character. First test whether the next byte \ is also available. */ \ uint32_t ch2; \ uint_fast32_t idx; \ \ if (__builtin_expect (inptr + 1 >= inend, 0)) \ { \ - /* The second character is not available. Store \ + /* The second byte is not available. Store \ the intermediate result. */ \ result = __GCONV_INCOMPLETE_INPUT; \ break; \ diff --git a/iconvdata/tst-table-from.c b/iconvdata/tst-table-from.c index 9bf0ba3683..084de5fe2b 100644 --- a/iconvdata/tst-table-from.c +++ b/iconvdata/tst-table-from.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2001 Free Software Foundation, Inc. +/* Copyright (C) 2000-2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. @@ -184,7 +184,7 @@ main (int argc, char *argv[]) if (argc != 2) { - fprintf (stderr, "Usage: tst-table-to charset\n"); + fprintf (stderr, "Usage: tst-table-from charset\n"); exit (1); } charset = argv[1]; |