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/big5.c | |
| parent | b9583166c0acb0f792fd741edaf6b35b6851694a (diff) | |
| download | glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.gz | |
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/big5.c')
| -rw-r--r-- | iconvdata/big5.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/iconvdata/big5.c b/iconvdata/big5.c index fabde6fdc9..e43229c6b3 100644 --- a/iconvdata/big5.c +++ b/iconvdata/big5.c @@ -8414,8 +8414,8 @@ static const char from_ucs4_tab15[][2] = /* See whether the second byte is in the correct range. */ \ if (ch2 >= 0x40 && ch2 <= 0x7e) \ idx += ch2 - 0x40; \ - else if (__builtin_expect (ch2, 0xa1) >= 0xa1 \ - && __builtin_expect (ch2, 0xa1) <= 0xfe) \ + else if (__builtin_expect (ch2 >= 0xa1, 1) \ + && __builtin_expect (ch2 <= 0xfe, 1)) \ idx += 0x3f + (ch2 - 0xa1); \ else \ { \ @@ -8484,8 +8484,8 @@ static const char from_ucs4_tab15[][2] = uint32_t ch = get32 (inptr); \ const char *cp; \ \ - if ((size_t) __builtin_expect (ch, 0) \ - >= sizeof (from_ucs4_tab1) / sizeof (from_ucs4_tab1[0])) \ + if (__builtin_expect (ch >= (sizeof (from_ucs4_tab1) \ + / sizeof (from_ucs4_tab1[0])), 0)) \ switch (ch) \ { \ case 0x2c7 ... 0x2d9: \ |