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/utf-16.c | |
| parent | b9583166c0acb0f792fd741edaf6b35b6851694a (diff) | |
| download | glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.zip glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.gz glibc-db2d05f93ce7a790a1f50ed5b082539b566801e2.tar.bz2 | |
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/utf-16.c')
| -rw-r--r-- | iconvdata/utf-16.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c index d39399e..d17f6c3 100644 --- a/iconvdata/utf-16.c +++ b/iconvdata/utf-16.c @@ -217,9 +217,9 @@ gconv_end (struct __gconv_step *data) \ if (swap) \ { \ - if (__builtin_expect (c, 0) >= 0x10000) \ + if (__builtin_expect (c >= 0x10000, 0)) \ { \ - if (__builtin_expect (c, 0) >= 0x110000) \ + if (__builtin_expect (c >= 0x110000, 0)) \ { \ STANDARD_ERR_HANDLER (4); \ } \ @@ -241,9 +241,9 @@ gconv_end (struct __gconv_step *data) } \ else \ { \ - if (__builtin_expect (c, 0) >= 0x10000) \ + if (__builtin_expect (c >= 0x10000, 0)) \ { \ - if (__builtin_expect (c, 0) >= 0x110000) \ + if (__builtin_expect (c >= 0x110000, 0)) \ { \ STANDARD_ERR_HANDLER (4); \ } \ @@ -285,7 +285,7 @@ gconv_end (struct __gconv_step *data) { \ u1 = bswap_16 (u1); \ \ - if (__builtin_expect (u1, 0) < 0xd800 || u1 > 0xdfff) \ + if (__builtin_expect (u1 < 0xd800, 1) || u1 > 0xdfff) \ { \ /* No surrogate. */ \ put32 (outptr, u1); \ @@ -307,8 +307,8 @@ gconv_end (struct __gconv_step *data) \ inptr += 2; \ u2 = bswap_16 (get16 (inptr)); \ - if (__builtin_expect (u2, 0xdc00) < 0xdc00 \ - || __builtin_expect (u2, 0xdc00) >= 0xdfff) \ + if (__builtin_expect (u2 < 0xdc00, 0) \ + || __builtin_expect (u2 == 0xdfff, 0)) \ { \ /* This is no valid second word for a surrogate. */ \ if (! ignore_errors_p ()) \ @@ -328,7 +328,7 @@ gconv_end (struct __gconv_step *data) } \ else \ { \ - if (__builtin_expect (u1, 0) < 0xd800 || u1 > 0xdfff) \ + if (__builtin_expect (u1 < 0xd800, 1) || u1 > 0xdfff) \ { \ /* No surrogate. */ \ put32 (outptr, u1); \ @@ -350,8 +350,8 @@ gconv_end (struct __gconv_step *data) \ inptr += 2; \ u2 = get16 (inptr); \ - if (__builtin_expect (u2, 0xdc00) < 0xdc00 \ - || __builtin_expect (u2, 0xdc00) >= 0xdfff) \ + if (__builtin_expect (u2 < 0xdc00, 0) \ + || __builtin_expect (u2 >= 0xdfff, 0)) \ { \ /* This is no valid second word for a surrogate. */ \ if (! ignore_errors_p ()) \ |