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/t.61.c | |
| parent | b9583166c0acb0f792fd741edaf6b35b6851694a (diff) | |
| download | glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.gz glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.bz2 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/t.61.c')
| -rw-r--r-- | iconvdata/t.61.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c index 9fd7fed6f6..5ccd72bdad 100644 --- a/iconvdata/t.61.c +++ b/iconvdata/t.61.c @@ -385,7 +385,7 @@ static const char from_ucs4[][2] = uint32_t ch = *inptr; \ int increment = 1; \ \ - if (__builtin_expect (ch, 0x20) >= 0xc1 && ch <= 0xcf) \ + if (__builtin_expect (ch >= 0xc1, 0) && ch <= 0xcf) \ { \ /* Composed character. First test whether the next character \ is also available. */ \ @@ -400,8 +400,8 @@ static const char from_ucs4[][2] = \ ch2 = inptr[1]; \ \ - if (__builtin_expect (ch2, 0x20) < 0x20 \ - || __builtin_expect (ch2, 0x20) >= 0x80) \ + if (__builtin_expect (ch2 < 0x20, 0) \ + || __builtin_expect (ch2 >= 0x80, 0)) \ { \ /* This is illegal. */ \ if (! ignore_errors_p ()) \ @@ -457,16 +457,16 @@ static const char from_ucs4[][2] = uint32_t ch = get32 (inptr); \ const char *cp; \ \ - if ((size_t) __builtin_expect (ch, 0) \ - >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \ + if (__builtin_expect (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]), \ + 0)) \ { \ if (__builtin_expect (ch, 0) == 0x2126) \ cp = "\xe0"; \ else if (__builtin_expect (ch, 0) == 0x2c7) \ cp = "\xcf\x20"; \ - else if (__builtin_expect (ch, 0x2d8) < 0x2d8 \ - || __builtin_expect (ch, 0x2d8) > 0x2dd \ - || __builtin_expect (ch, 0x2d8) == 0x02dc) \ + else if (__builtin_expect (ch < 0x2d8, 0) \ + || __builtin_expect (ch > 0x2dd, 0) \ + || __builtin_expect (ch == 0x2dc, 0)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ |