diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-03 22:09:42 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-03 22:09:42 +0000 |
| commit | db2d05f93ce7a790a1f50ed5b082539b566801e2 (patch) | |
| tree | f9798dd65c34397e50a7fff0a41fc160e645c2aa /iconvdata/sjis.c | |
| parent | b9583166c0acb0f792fd741edaf6b35b6851694a (diff) | |
| download | glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.gz glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.xz glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.zip | |
Update.
* iconvdata/8bit-gap.c: Correctly use __builtin_expect. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/gb18030.c: Likewise. * iconvdata/gbbig5.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/ibm930.c: Likewise. * iconvdata/ibm932.c: Likewise. * iconvdata/ibm933.c: Likewise. * iconvdata/ibm935.c: Likewise. * iconvdata/ibm939.c: Likewise. * iconvdata/ibm943.c: Likewise. * iconvdata/iso-2022-cn.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/unicode.c: Likewise. * iconvdata/utf-16.c: Likewise. * iconv/gconv_simple.c: Likewise. Convert assert() in real error handling.
Diffstat (limited to 'iconvdata/sjis.c')
| -rw-r--r-- | iconvdata/sjis.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c index ba36fa9fad..3a19642c83 100644 --- a/iconvdata/sjis.c +++ b/iconvdata/sjis.c @@ -4360,9 +4360,9 @@ static const char from_ucs4_extra[0x100][2] = ch = halfkana_to_ucs4[ch - 0xa1]; \ ++inptr; \ } \ - else if (__builtin_expect (ch, 0) > 0xea \ + else if (__builtin_expect (ch > 0xea, 0) \ || __builtin_expect (ch, 0) == 0xa0 \ - || __builtin_expect (ch, 0x81) <= 0x80) \ + || __builtin_expect (ch <= 0x80, 0)) \ { \ /* These are illegal. */ \ if (! ignore_errors_p ()) \ @@ -4394,10 +4394,10 @@ static const char from_ucs4_extra[0x100][2] = ch2 = inptr[1]; \ idx = ch * 256 + ch2; \ if (__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) \ - || __builtin_expect (idx, 0x8140) > 0xeaa4) \ + || (__builtin_expect (idx > 0x84be, 0) && idx < 0x889f) \ + || (__builtin_expect (idx > 0x88fc, 0) && idx < 0x8940) \ + || (__builtin_expect (idx > 0x9ffc, 0) && idx < 0xe040) \ + || __builtin_expect (idx > 0xeaa4, 0)) \ { \ /* This is illegal. */ \ if (! ignore_errors_p ()) \ @@ -4467,8 +4467,8 @@ static const char from_ucs4_extra[0x100][2] = cp = from_ucs4_greek[ch - 0x391]; \ else if (ch >= 0x2010 && ch <= 0x9fa0) \ cp = from_ucs4_cjk[ch - 0x02010]; \ - else if (__builtin_expect (ch, 0xff01) >= 0xff01 \ - && __builtin_expect (ch, 0xff01) <= 0xffef) \ + else if (__builtin_expect (ch >= 0xff01, 1) \ + && __builtin_expect (ch <= 0xffef, 1)) \ cp = from_ucs4_extra[ch - 0xff00]; \ else \ { \ |