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.

28 files changed, 108 insertions, 108 deletions

diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c
index e5942be160..8959fcbd95 100644
--- a/iconvdata/8bit-gap.c
+++ b/iconvdata/8bit-gap.c
@@ -82,7 +82,7 @@ struct gap
     uint32_t ch = get32 (inptr);					      \
     unsigned char res;							      \
 									      \
-    if (__builtin_expect (ch, 0) >= 0xffff)				      \
+    if (__builtin_expect (ch >= 0xffff, 0))				      \
       {									      \
 	UNICODE_TAG_HANDLER (ch, 4);					      \
 	rp = NULL;							      \
diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c
index c11e25addb..21de42dbcd 100644
--- a/iconvdata/ansi_x3.110.c
+++ b/iconvdata/ansi_x3.110.c
@@ -402,7 +402,7 @@ static const char from_ucs4[][2] =
     uint32_t ch = *inptr;						      \
     int incr;								      \
 									      \
-    if (__builtin_expect (ch, 0x00) >= 0xc1 && ch <= 0xcf)		      \
+    if (__builtin_expect (ch >= 0xc1, 0) && ch <= 0xcf)			      \
       {									      \
 	/* Composed character.  First test whether the next character	      \
 	   is also available.  */					      \
@@ -417,8 +417,8 @@ static const char from_ucs4[][2] =
 									      \
 	ch2 = inptr[1];							      \
 									      \
-	if (__builtin_expect (ch2, 0x20) < 0x20				      \
-	    || __builtin_expect (ch2, 0x7f) >= 0x80)			      \
+	if (__builtin_expect (ch2 < 0x20, 0)				      \
+	    || __builtin_expect (ch2 >= 0x80, 0))			      \
 	  {								      \
 	    /* This is illegal.  */					      \
 	    if (! ignore_errors_p ())					      \
@@ -474,8 +474,8 @@ 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 (ch == 0x2c7)						      \
 	  cp = "\xcf\x20";						      \
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:						      \
diff --git a/iconvdata/euc-cn.c b/iconvdata/euc-cn.c
index 2b69b555a9..e3a0161cc3 100644
--- a/iconvdata/euc-cn.c
+++ b/iconvdata/euc-cn.c
@@ -45,8 +45,8 @@
     if (ch <= 0x7f)							      \
       ++inptr;								      \
     else								      \
-      if ((__builtin_expect (ch, 0xa1) <= 0xa0 && ch != 0x8e && ch != 0x8f)   \
-	  || __builtin_expect (ch, 0xfe) > 0xfe)			      \
+      if ((__builtin_expect (ch <= 0xa0, 0) && ch != 0x8e && ch != 0x8f)      \
+	  || __builtin_expect (ch > 0xfe, 0))				      \
 	{								      \
 	  /* This is illegal.  */					      \
 	  if (! ignore_errors_p ())					      \
@@ -76,7 +76,7 @@
 	  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))				      \
 	    {								      \
 	      if (! ignore_errors_p ())					      \
 		{							      \
diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c
index abb4bc6e7c..1a638994a3 100644
--- a/iconvdata/euc-jp.c
+++ b/iconvdata/euc-jp.c
@@ -77,7 +77,7 @@
 	ch2 = inptr[1];							      \
 									      \
 	/* All second bytes of a multibyte character must be >= 0xa1. */      \
-	if (__builtin_expect (ch2, 0xa1) < 0xa1)			      \
+	if (__builtin_expect (ch2 < 0xa1, 0))				      \
 	  {								      \
 	    /* This is an illegal character.  */			      \
 	    if (! ignore_errors_p ())					      \
diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index 5e8974bd4d..02c2f4b335 100644
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -81,9 +81,9 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
       ++inptr;								      \
     /* 0xfe(->0x7e : row 94) and 0xc9(->0x59 : row 41) are		      \
        user-defined areas.  */						      \
-    else if (__builtin_expect (ch, 0xa1) == 0xa0			      \
-	     || __builtin_expect (ch, 0xa1) > 0xfe			      \
-	     || __builtin_expect (ch, 0xa1) == 0xc9)			      \
+    else if (__builtin_expect (ch == 0xa0, 0)				      \
+	     || __builtin_expect (ch > 0xfe, 0)				      \
+	     || __builtin_expect (ch == 0xc9, 0))			      \
       {									      \
 	/* This is illegal.  */						      \
 	if (! ignore_errors_p ())					      \
diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c
index 5400d64838..0ab68984c3 100644
--- a/iconvdata/gb18030.c
+++ b/iconvdata/gb18030.c
@@ -22068,7 +22068,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
 									      \
 	      inptr += 4;						      \
 	    }								      \
-	  else if (__builtin_expect (ch2, 0x40) >= 0x40)   		      \
+	  else if (__builtin_expect (ch2 >= 0x40, 1))   		      \
 	    {								      \
 	      /* A two-byte character */				      \
 	      idx = (ch - 0x81) * 192 + (ch2 - 0x40);			      \
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								      \
 	  {								      \
diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c
index 6d789de771..04deac6c7e 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 <drepper@cygnus.com>, 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);					      \
diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c
index 8de6b35244..98f05371af 100644
--- a/iconvdata/gbk.c
+++ b/iconvdata/gbk.c
@@ -13145,8 +13145,8 @@ static const char __gbk_from_ucs4_tab12[][2] =
     if (ch <= 0x7f)							      \
       ++inptr;								      \
     else								      \
-      if (__builtin_expect (ch, 0x81) <= 0x80				      \
-	  || __builtin_expect (ch, 0x81) > 0xfe)			      \
+      if (__builtin_expect (ch <= 0x80, 0)				      \
+	  || __builtin_expect (ch > 0xfe, 0))				      \
 	{								      \
 	  /* This is illegal.  */					      \
 	  if (! ignore_errors_p ())					      \
@@ -13178,7 +13178,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
 									      \
 	  /* All second bytes of a multibyte character must be >= 0x40, and   \
 	     the __gbk_to_ucs table only covers the range up to 0xfe 0xa0. */ \
-	  if (__builtin_expect (ch2, 0x41) < 0x40			      \
+	  if (__builtin_expect (ch2 < 0x40, 0)				      \
 	      || (__builtin_expect (ch, 0x81) == 0xfe && ch2 > 0xa0))	      \
 	    {								      \
 	      /* This is an illegal character.  */			      \
diff --git a/iconvdata/ibm930.c b/iconvdata/ibm930.c
index eb638b646a..faadfffcf1 100644
--- a/iconvdata/ibm930.c
+++ b/iconvdata/ibm930.c
@@ -201,7 +201,7 @@ enum
     const struct gap *rp2 = __ucs4_to_ibm930db_idx;			      \
     const char *cp;							      \
 									      \
-    if (__builtin_expect (ch, 0) >= 0xffff)				      \
+    if (__builtin_expect (ch >= 0xffff, 0))				      \
       {									      \
 	UNICODE_TAG_HANDLER (ch, 4);					      \
 									      \
@@ -243,7 +243,7 @@ enum
 	  {								      \
 	    if (curcs == sb)						      \
 	      {								      \
-		if (__builtin_expect (outptr+1 > outend, 0))		      \
+		if (__builtin_expect (outptr + 1 > outend, 0))		      \
 		  {							      \
 		    result = __GCONV_FULL_OUTPUT;			      \
 		    break;						      \
diff --git a/iconvdata/ibm932.c b/iconvdata/ibm932.c
index 05d50ad86f..b81c14d05d 100644
--- a/iconvdata/ibm932.c
+++ b/iconvdata/ibm932.c
@@ -26,7 +26,7 @@
 #endif
 
 #define FROM	0
-#define TO	1 
+#define TO	1
 
 /* Definitions used in the body of the `gconv' function.  */
 #define CHARSET_NAME	"IBM932//"
@@ -53,7 +53,7 @@
     uint32_t ch = *inptr;						      \
     uint32_t res;							      \
 									      \
-    if (__builtin_expect (ch, 0) >= 0xffff)				      \
+    if (__builtin_expect (ch >= 0xffff, 0))				      \
       {									      \
 	rp1 = NULL;							      \
 	rp2 = NULL;							      \
@@ -155,7 +155,7 @@
     uint32_t high;							      \
     uint16_t pccode;							      \
 									      \
-    if (__builtin_expect (ch, 0) >= 0xffff)				      \
+    if (__builtin_expect (ch >= 0xffff, 0))				      \
       {									      \
 	UNICODE_TAG_HANDLER (ch, 4);					      \
 	rp = NULL;							      \
diff --git a/iconvdata/ibm933.c b/iconvdata/ibm933.c
index c3a73472e2..804c2bd3eb 100644
--- a/iconvdata/ibm933.c
+++ b/iconvdata/ibm933.c
@@ -203,7 +203,7 @@ enum
     const struct gap *rp2 = __ucs4_to_ibm933db_idx;			      \
     const char *cp;							      \
 									      \
-    if (__builtin_expect (ch, 0) >= 0xffff)				      \
+    if (__builtin_expect (ch >= 0xffff, 0))				      \
       {									      \
 	UNICODE_TAG_HANDLER (ch, 4);					      \
 									      \
@@ -245,7 +245,7 @@ enum
 	  {								      \
 	    if (curcs == sb)						      \
 	      {								      \
-		if (__builtin_expect (outptr+1 > outend, 0))		      \
+		if (__builtin_expect (outptr + 1 > outend, 0))		      \
 		  {							      \
 		    result = __GCONV_FULL_OUTPUT;			      \
 		    break;						      \
diff --git a/iconvdata/ibm935.c b/iconvdata/ibm935.c
index 91dff9420f..70d6149eef 100644
--- a/iconvdata/ibm935.c
+++ b/iconvdata/ibm935.c
@@ -201,7 +201,7 @@ enum
     const struct gap *rp2 = __ucs4_to_ibm935db_idx;			      \
     const char *cp;							      \
 									      \
-    if (__builtin_expect (ch, 0) >= 0xffff)				      \
+    if (__builtin_expect (ch >= 0xffff, 0))				      \
       {									      \
 	UNICODE_TAG_HANDLER (ch, 4);					      \
 									      \
@@ -243,7 +243,7 @@ enum
 	  {								      \
 	    if (curcs == sb)						      \
 	      {								      \
-		if (__builtin_expect (outptr+1 > outend, 0))		      \
+		if (__builtin_expect (outptr + 1 > outend, 0))		      \
 		  {							      \
 		    result = __GCONV_FULL_OUTPUT;			      \
 		    break;						      \
diff --git a/iconvdata/ibm939.c b/iconvdata/ibm939.c
index 445faeae79..1cf77744df 100644
--- a/iconvdata/ibm939.c
+++ b/iconvdata/ibm939.c
@@ -201,7 +201,7 @@ enum
     const struct gap *rp2 = __ucs4_to_ibm939db_idx;			      \
     const char *cp;							      \
 									      \
-    if (__builtin_expect (ch, 0) >= 0xffff)				      \
+    if (__builtin_expect (ch >= 0xffff, 0))				      \
       {									      \
 	UNICODE_TAG_HANDLER (ch, 4);					      \
 	rp1 = NULL;							      \
@@ -238,7 +238,7 @@ enum
 	  {								      \
 	    if (curcs == sb)						      \
 	      {								      \
-		if (__builtin_expect (outptr+1 > outend, 0))		      \
+		if (__builtin_expect (outptr + 1 > outend, 0))		      \
 		  {							      \
 		    result = __GCONV_FULL_OUTPUT;			      \
 		    break;						      \
diff --git a/iconvdata/ibm943.c b/iconvdata/ibm943.c
index 2bb2884b4c..2819e25d74 100644
--- a/iconvdata/ibm943.c
+++ b/iconvdata/ibm943.c
@@ -26,7 +26,7 @@
 #endif
 
 #define FROM	0
-#define TO	1 
+#define TO	1
 
 /* Definitions used in the body of the `gconv' function.  */
 #define CHARSET_NAME	"IBM943//"