diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-31 22:47:52 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-31 22:47:52 +0000 |
| commit | 5134584a32101dad1ed7691a25cf3309c2994e50 (patch) | |
| tree | b7b83f553d961412a644be3d7fe2e93c2a93a167 /iconvdata/sjis.c | |
| parent | 89533d414f8a24c12c9d5874077d4057bf4ffb6a (diff) | |
Update.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/sjis.c (BODY for FROM_LOOP): Treat the case
ch >= 0x81 && ch2 < 0x40 as invalid.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/uhc.c (BODY for FROM_LOOP): Reject ch2 == 0xff as invalid.
(BODY for TO_LOOP): Accept 0x7f. Increment outptr as needed.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/johab.c (BODY for TO_LOOP): After calling
ucs4_to_ksc5601_sym, fix the conversion to JOHAB.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/t.61.c (to_ucs4): Change values of 0xa4, 0a6, 0xa8, 0xb4,
0xb8.
(from_ucs4): Change values of U+00A4, U+00BB, U+00ED.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/macintosh.c (HAS_HOLES): Set to 1.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/iso_6937.c (to_ucs4): Change values of 0x24 and 0xb4.
(from_ucs4): Change values of U+00A4 and U+00ED.
(BODY of TO_LOOP): Remove mapping from U+02DC to 0x0020.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/ansi_x3.110.c (from_ucs4): Change entry for 0xed.
(BODY for TO_LOOP): Map U+2122, U+2126, not U+2022, U+2026.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/Makefile (gen-8bit-gap-modules): Remove isiri-3342.
* iconvdata/isiri-3342.h: New file.
* iconvdata/isiri-3342.c (HAS_HOLES): Avoid gaps >= 0xe0, but don't
treat 0x80 as a gap.
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead. Fix return value.
Diffstat (limited to 'iconvdata/sjis.c')
| -rw-r--r-- | iconvdata/sjis.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c index 29d558f60c..60d1e28508 100644 --- a/iconvdata/sjis.c +++ b/iconvdata/sjis.c @@ -4388,7 +4388,8 @@ static const char from_ucs4_extra[0x100][2] = \ ch2 = inptr[1]; \ idx = ch * 256 + ch2; \ - if (__builtin_expect (idx, 0x8140) < 0x8140 \ + if (__builtin_expect (ch < 0x81, 0) \ + || __builtin_expect (ch2 < 0x40, 0) \ || (__builtin_expect (idx, 0x8140) > 0x84be && idx < 0x889f) \ || (__builtin_expect (idx, 0x8140) > 0x88fc && idx < 0x8940) \ || (__builtin_expect (idx, 0x8140) > 0x9ffc && idx < 0xe040) \ |