From db2d05f93ce7a790a1f50ed5b082539b566801e2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 3 Aug 2001 22:09:42 +0000 Subject: 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. --- iconvdata/gbgbk.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'iconvdata/gbgbk.c') diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c index 6d789de..04deac6 100644 --- a/iconvdata/gbgbk.c +++ b/iconvdata/gbgbk.c @@ -1,5 +1,5 @@ /* Mapping tables from GBK to GB2312 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 , 1999. @@ -96,16 +96,16 @@ ch = 0xa1aa; \ \ /* Now determine whether the character is valid. */ \ - if (__builtin_expect (ch, 0xa1a1) < 0xa1a1 \ - || __builtin_expect (ch, 0xa1a1) > 0xf7fe \ - || __builtin_expect (inptr[1], 0xa1) < 0xa1 \ + if (__builtin_expect (ch < 0xa1a1, 0) \ + || __builtin_expect (ch > 0xf7fe, 0) \ + || __builtin_expect (inptr[1] < 0xa1, 0) \ /* Now test the exceptions. */ \ - || (__builtin_expect (ch, 0xa1a1) >= 0xa2a1 \ - && __builtin_expect (ch, 0xa1a1) <= 0xa2aa) \ - || (__builtin_expect (ch, 0xa1a1) >= 0xa6e0 \ - && __builtin_expect (ch, 0xa1a1) <= 0xa6f5) \ - || (__builtin_expect (ch, 0xa1a1) >= 0xa8bb \ - && __builtin_expect (ch, 0xa1a1) <= 0xa8c0)) \ + || (__builtin_expect (ch >= 0xa2a1, 0) \ + && __builtin_expect (ch <= 0xa2aa, 0)) \ + || (__builtin_expect (ch >= 0xa6e0, 0) \ + && __builtin_expect (ch <= 0xa6f5, 0)) \ + || (__builtin_expect (ch >= 0xa8bb, 0) \ + && __builtin_expect (ch <= 0xa8c0, 0))) \ { \ /* One of the characters we cannot map. */ \ STANDARD_ERR_HANDLER (2); \ -- cgit v1.1