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/gbbig5.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/gbbig5.c')
| -rw-r--r-- | iconvdata/gbbig5.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/iconvdata/gbbig5.c b/iconvdata/gbbig5.c index 56d6379e97..a7d94053c9 100644 --- a/iconvdata/gbbig5.c +++ b/iconvdata/gbbig5.c @@ -1,5 +1,5 @@ /* Mapping tables from GB2312 to BIG5 and vice versa. - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -26,7 +26,7 @@ * This module does convertions between gb2312 and big5 encodings. * It is necessary because gb2312 encoding use simplified chinese, * while big5 use traditional one. Often times both the simplified - * version of a chinese character and its traditional counterpart + * version of a chinese character and its traditional counterpart * are presented in unicode and have distinctive code values. So * an indirect method through UCS4 (GB2312 <=> UCS4 <=> BIG5) will * not do the work correctly. @@ -4818,7 +4818,7 @@ const char __from_big5_to_gb2312 [13973][2] = ch = inptr[1]; \ \ /* All second bytes of a multibyte character must be >= 0xa1. */ \ - if (__builtin_expect (ch, 0xa1) < 0xa1) \ + if (__builtin_expect (ch < 0xa1, 0)) \ { \ /* This is an illegal character. */ \ if (! ignore_errors_p ()) \ @@ -4926,8 +4926,8 @@ const char __from_big5_to_gb2312 [13973][2] = /* See if the second byte is in the correct range. */ \ if (ch >= 0x40 && ch <= 0x7e) \ idx += ch - 0x40; \ - else if (__builtin_expect (ch, 0xa1) >= 0xa1 \ - && __builtin_expect (ch, 0xa1) <= 0xfe) \ + else if (__builtin_expect (ch >= 0xa1, 1) \ + && __builtin_expect (ch <= 0xfe, 1)) \ idx += 0x3f + (ch - 0xa1); \ else \ { \ |