diff options
author | Roland McGrath <roland@gnu.org> | 2005-07-18 04:41:16 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2005-07-18 04:41:16 +0000 |
commit | 7a85da437bd49afd827c41474677c3904cf7ce3e (patch) | |
tree | 8ab56107960fcc0f3a2cf39f2eef07aadc180e1a /iconvdata | |
parent | efe36102b1d423e82e94217e069460134cde5687 (diff) |
Updated to fedora-glibc-2_3-20050718T0425
Diffstat (limited to 'iconvdata')
-rw-r--r-- | iconvdata/ibm930.h | 2 | ||||
-rw-r--r-- | iconvdata/ibm939.c | 18 | ||||
-rw-r--r-- | iconvdata/ibm939.h | 2 | ||||
-rw-r--r-- | iconvdata/testdata/IBM930..UTF8 | bin | 48136 -> 48138 bytes | |||
-rw-r--r-- | iconvdata/testdata/IBM939..UTF8 | bin | 48136 -> 48138 bytes |
5 files changed, 10 insertions, 12 deletions
diff --git a/iconvdata/ibm930.h b/iconvdata/ibm930.h index cbf24c39c2..739a88fe9d 100644 --- a/iconvdata/ibm930.h +++ b/iconvdata/ibm930.h @@ -45,7 +45,7 @@ static const uint16_t __ibm930sb_to_ucs4[256] = /* 0x40 */ 0x0020, 0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67, /* 0x48 */ 0xFF68, 0xFF69, 0x00A3, 0x002E, 0x003C, 0x0028, 0x002B, 0x007C, /* 0x50 */ 0x0026, 0xFF6A, 0xFF6B, 0xFF6C, 0xFF6D, 0xFF6E, 0xFF6F, 0x0000, - /* 0x58 */ 0xFF70, 0x0000, 0x0021, 0x005C, 0x002A, 0x0029, 0x003B, 0x00AC, + /* 0x58 */ 0xFF70, 0x0000, 0x0021, 0x00A5, 0x002A, 0x0029, 0x003B, 0x00AC, /* 0x60 */ 0x002D, 0x002F, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, /* 0x68 */ 0x0067, 0x0068, 0x0000, 0x002C, 0x0025, 0x005F, 0x003E, 0x003F, /* 0x70 */ 0x005B, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, diff --git a/iconvdata/ibm939.c b/iconvdata/ibm939.c index aae08ba3d1..50b083f492 100644 --- a/iconvdata/ibm939.c +++ b/iconvdata/ibm939.c @@ -1,5 +1,5 @@ /* Conversion to and from IBM939. - Copyright (C) 2000-2002 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -200,16 +200,14 @@ enum if (__builtin_expect (ch >= 0xffff, 0)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ - rp1 = NULL; \ - rp2 = NULL; \ + goto ibm939_invalid_char; \ } \ - else \ - while (ch > rp1->end) \ - ++rp1; \ + \ + while (ch > rp1->end) \ + ++rp1; \ \ /* Use the UCS4 table for single byte. */ \ - if (__builtin_expect (rp1 == NULL, 0) \ - || __builtin_expect (ch < rp1->start, 0) \ + if (__builtin_expect (ch < rp1->start, 0) \ || (cp = __ucs4_to_ibm939sb[ch + rp1->idx], \ __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \ { \ @@ -217,12 +215,12 @@ enum while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ - || __builtin_expect (ch < rp2->start, 0) \ + if (__builtin_expect (ch < rp2->start, 0) \ || (cp = __ucs4_to_ibm939db[ch + rp2->idx], \ __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \ { \ /* This is an illegal character. */ \ + ibm939_invalid_char: \ STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ else \ diff --git a/iconvdata/ibm939.h b/iconvdata/ibm939.h index 0597294ac6..900a5e2445 100644 --- a/iconvdata/ibm939.h +++ b/iconvdata/ibm939.h @@ -56,7 +56,7 @@ static const uint16_t __ibm939sb_to_ucs4[256] = /* 0x98 */ 0x0071, 0x0072, 0xFF89, 0xFF8A, 0xFF8B, 0xFF8C, 0xFF8D, 0xFF8E, /* 0xa0 */ 0x203E, 0x007E, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, /* 0xa8 */ 0x0079, 0x007A, 0xFF8F, 0xFF90, 0xFF91, 0x005B, 0xFF92, 0xFF93, - /* 0xb0 */ 0x005E, 0x00A3, 0x005C, 0xFF94, 0xFF95, 0xFF96, 0xFF97, 0xFF98, + /* 0xb0 */ 0x005E, 0x00A3, 0x00A5, 0xFF94, 0xFF95, 0xFF96, 0xFF97, 0xFF98, /* 0xb8 */ 0xFF99, 0xFF9A, 0xFF9B, 0xFF9C, 0xFF9D, 0x005D, 0xFF9E, 0xFF9F, /* 0xc0 */ 0x007B, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, /* 0xc8 */ 0x0048, 0x0049, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, diff --git a/iconvdata/testdata/IBM930..UTF8 b/iconvdata/testdata/IBM930..UTF8 Binary files differindex 89df7f15ac..639a16fdac 100644 --- a/iconvdata/testdata/IBM930..UTF8 +++ b/iconvdata/testdata/IBM930..UTF8 diff --git a/iconvdata/testdata/IBM939..UTF8 b/iconvdata/testdata/IBM939..UTF8 Binary files differindex 89df7f15ac..639a16fdac 100644 --- a/iconvdata/testdata/IBM939..UTF8 +++ b/iconvdata/testdata/IBM939..UTF8 |