Update.

2000-06-16  Ulrich Drepper  <drepper@redhat.com>

	* iconv/gconv_int.h (norm_add_slashes): Optionally add given suffix.
	* iconv/gconv_open.c: Remove error handling specification from `from'
	character set name.
	* intl/loadmsgcat.c (_nl_load_domain): Call norm_add_slashes with
	new parameter to always enable transliteration.
	* locale/localeinfo.h (LIMAGIC): Bump number because of incompatible
	change.
	(struct locale_data): Add new members use_translit and options.
	* locale/findlocale.c (_nl_find_locale): Set use_translit flag is
	character set name contained modifier TRANSLIT.
	* locale/loadlocale.c (_nl_load_locale): Initialize new use_translit
	and options fields.
	(_nl_unload_locale): Free options string if necessary.
	* wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Enable translation if
	the locale names suggested this.
	* locale/C-address.c: Add two new initialilzers to adjust data
	structure for new format.
	* locale/C-collate.c: Likewise.
	* locale/C-ctype.c: Likewise.
	* locale/C-identification.c: Likewise.
	* locale/C-measurement.c: Likewise.
	* locale/C-messages.c: Likewise.
	* locale/C-monetary.c: Likewise.
	* locale/C-name.c: Likewise.
	* locale/C-numeric.c: Likewise.
	* locale/C-paper.c: Likewise.
	* locale/C-telephone.c: Likewise.
	* locale/C-time.c: Likewise.

	* locale/setlocale.c: Add some more __builtin_expect.

24 files changed, 36 insertions, 36 deletions

diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c
index 6394065c56..a4a32d3eae 100644
--- a/iconvdata/8bit-gap.c
+++ b/iconvdata/8bit-gap.c
@@ -89,7 +89,7 @@ struct gap
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
@@ -112,7 +112,7 @@ struct gap
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
@@ -137,7 +137,7 @@ struct gap
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c
index 1478c5be59..02d972e21c 100644
--- a/iconvdata/8bit-generic.c
+++ b/iconvdata/8bit-generic.c
@@ -72,7 +72,7 @@
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c
index f338055f39..6ec09c3c5c 100644
--- a/iconvdata/ansi_x3.110.c
+++ b/iconvdata/ansi_x3.110.c
@@ -501,7 +501,7 @@ static const char from_ucs4[][2] =
 		  {							      \
 		    result = DL_CALL_FCT (step_data->__trans.__trans_fct,     \
 					  (step, step_data, *inptrp, &inptr,  \
-					   inend, &outbuf, irreversible));    \
+					   inend, &outptr, irreversible));    \
 		    if (result != __GCONV_OK)				      \
 		      break;						      \
 		  }							      \
@@ -559,7 +559,7 @@ static const char from_ucs4[][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
@@ -587,7 +587,7 @@ static const char from_ucs4[][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
diff --git a/iconvdata/big5.c b/iconvdata/big5.c
index 8cad304c7a..947a92a341 100644
--- a/iconvdata/big5.c
+++ b/iconvdata/big5.c
@@ -8589,7 +8589,7 @@ static const char from_ucs4_tab13[][2] =
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/big5hkscs.c b/iconvdata/big5hkscs.c
index 0859dd8f09..64923d42af 100644
--- a/iconvdata/big5hkscs.c
+++ b/iconvdata/big5hkscs.c
@@ -12746,7 +12746,7 @@ static const char from_ucs4_tab14[][2] =
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/euc-cn.c b/iconvdata/euc-cn.c
index 075970ce96..18e73fda6c 100644
--- a/iconvdata/euc-cn.c
+++ b/iconvdata/euc-cn.c
@@ -145,7 +145,7 @@
 		  {							      \
 		    result = DL_CALL_FCT (step_data->__trans.__trans_fct,     \
 					  (step, step_data, *inptrp, &inptr,  \
-					   inend, &outbuf, irreversible));    \
+					   inend, &outptr, irreversible));    \
 		    if (result != __GCONV_OK)				      \
 		      break;						      \
 		  }							      \
diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c
index 771dc069e8..3e21d55f12 100644
--- a/iconvdata/euc-jp.c
+++ b/iconvdata/euc-jp.c
@@ -222,7 +222,7 @@
 		      {							      \
 			result = DL_CALL_FCT (step_data->__trans.__trans_fct, \
 					      (step, step_data, *inptrp,      \
-					       &inptr, inend, &outbuf,	      \
+					       &inptr, inend, &outptr,	      \
 					       irreversible));		      \
 			if (result != __GCONV_OK)			      \
 			  break;					      \
diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index e953df5dc9..c32b9b3537 100644
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -150,7 +150,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/euc-tw.c b/iconvdata/euc-tw.c
index f3152478e2..b4cf21ba97 100644
--- a/iconvdata/euc-tw.c
+++ b/iconvdata/euc-tw.c
@@ -197,7 +197,7 @@
 		  {							      \
 		    result = DL_CALL_FCT (step_data->__trans.__trans_fct,     \
 					  (step, step_data, *inptrp, &inptr,  \
-					   inend, &outbuf, irreversible));    \
+					   inend, &outptr, irreversible));    \
 		    if (result != __GCONV_OK)				      \
 		      break;						      \
 		  }							      \
diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c
index 15e72d9cfb..0afcd72311 100644
--- a/iconvdata/gbgbk.c
+++ b/iconvdata/gbgbk.c
@@ -106,7 +106,7 @@
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c
index 669e4a9c9f..4505b65c1a 100644
--- a/iconvdata/gbk.c
+++ b/iconvdata/gbk.c
@@ -13456,7 +13456,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
 	    {								      \
 	      result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				    (step, step_data, *inptrp, &inptr, inend, \
-				     &outbuf, irreversible));		      \
+				     &outptr, irreversible));		      \
 	      if (result != __GCONV_OK)					      \
 		break;							      \
 	    }								      \
diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c
index 818f2a773c..f2170698dd 100644
--- a/iconvdata/iso-2022-cn.c
+++ b/iconvdata/iso-2022-cn.c
@@ -328,7 +328,7 @@ enum
 		      {							      \
 			result = DL_CALL_FCT (step_data->__trans.__trans_fct, \
 					      (step, step_data, *inptrp,      \
-					       &inptr, inend, &outbuf,	      \
+					       &inptr, inend, &outptr,	      \
 					       irreversible));		      \
 			if (result != __GCONV_OK)			      \
 			  break;					      \
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index b66c9503b5..ab42bcc75c 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -707,7 +707,7 @@ gconv_end (struct __gconv_step *data)
 		      {							      \
 			result = DL_CALL_FCT (step_data->__trans.__trans_fct, \
 					      (step, step_data, *inptrp,      \
-					       &inptr, inend, &outbuf,	      \
+					       &inptr, inend, &outptr,	      \
 					       irreversible));		      \
 			if (result != __GCONV_OK)			      \
 			  break;					      \
@@ -894,7 +894,7 @@ gconv_end (struct __gconv_step *data)
 					    result = DL_CALL_FCT	      \
   					      (step_data->__trans.__trans_fct,\
 					       (step, step_data, *inptrp,     \
-						&inptr, inend, &outbuf,	      \
+						&inptr, inend, &outptr,	      \
 						irreversible));		      \
 					    if (result != __GCONV_OK)	      \
 					      break;			      \
diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c
index d3cca52d05..52031ca177 100644
--- a/iconvdata/iso-2022-kr.c
+++ b/iconvdata/iso-2022-kr.c
@@ -259,7 +259,7 @@ enum
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c
index df81ee2be6..66f89589cc 100644
--- a/iconvdata/iso646.c
+++ b/iconvdata/iso646.c
@@ -889,7 +889,7 @@ gconv_end (struct __gconv_step *data)
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c
index d69a201fed..a6134816db 100644
--- a/iconvdata/iso8859-1.c
+++ b/iconvdata/iso8859-1.c
@@ -53,7 +53,7 @@
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c
index 536d8965fa..cde210844d 100644
--- a/iconvdata/iso_6937-2.c
+++ b/iconvdata/iso_6937-2.c
@@ -569,7 +569,7 @@ static const char from_ucs4[][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
@@ -594,7 +594,7 @@ static const char from_ucs4[][2] =
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c
index f812ce2c93..e767291adf 100644
--- a/iconvdata/iso_6937.c
+++ b/iconvdata/iso_6937.c
@@ -546,7 +546,7 @@ static const char from_ucs4[][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
@@ -571,7 +571,7 @@ static const char from_ucs4[][2] =
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index ac3bf82b27..d2947dcd89 100644
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -400,7 +400,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		  {							      \
 		    result = DL_CALL_FCT (step_data->__trans.__trans_fct,     \
 					  (step, step_data, *inptrp, &inptr,  \
- 					   inend, &outbuf, irreversible));    \
+ 					   inend, &outptr, irreversible));    \
 		    if (result != __GCONV_OK)				      \
 		      break;						      \
 		  }							      \
@@ -445,7 +445,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		  {							      \
 		    result = DL_CALL_FCT (step_data->__trans.__trans_fct,     \
 					  (step, step_data, *inptrp, &inptr,  \
-					   inend, &outbuf, irreversible));    \
+					   inend, &outptr, irreversible));    \
 		    if (result != __GCONV_OK)				      \
 		      break;						      \
 		  }							      \
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 806579b283..aa51259355 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -4472,7 +4472,7 @@ static const char from_ucs4_extra[0x100][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
@@ -4500,7 +4500,7 @@ static const char from_ucs4_extra[0x100][2] =
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c
index a7d42277c9..3c1a69e4ab 100644
--- a/iconvdata/t.61.c
+++ b/iconvdata/t.61.c
@@ -473,7 +473,7 @@ static const char from_ucs4[][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
- 				       inend, &outbuf, irreversible));	      \
+ 				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
@@ -510,7 +510,7 @@ static const char from_ucs4[][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c
index 9c494ff705..5526e9b5ba 100644
--- a/iconvdata/uhc.c
+++ b/iconvdata/uhc.c
@@ -3225,7 +3225,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
@@ -3265,7 +3265,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
 	      {								      \
 		result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				      (step, step_data, *inptrp, &inptr,      \
-				       inend, &outbuf, irreversible));	      \
+				       inend, &outptr, irreversible));	      \
 		if (result != __GCONV_OK)				      \
 		  break;						      \
 	      }								      \
diff --git a/iconvdata/unicode.c b/iconvdata/unicode.c
index e818c54c31..9caa95df0f 100644
--- a/iconvdata/unicode.c
+++ b/iconvdata/unicode.c
@@ -156,7 +156,7 @@ gconv_end (struct __gconv_step *data)
 	  {								      \
 	    result = DL_CALL_FCT (step_data->__trans.__trans_fct,	      \
 				  (step, step_data, *inptrp, &inptr, inend,   \
-				   &outbuf, irreversible));		      \
+				   &outptr, irreversible));		      \
 	    if (result != __GCONV_OK)					      \
 	      break;							      \
 	  }								      \
diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c
index 44911feb42..fd7bba72bf 100644
--- a/iconvdata/utf-16.c
+++ b/iconvdata/utf-16.c
@@ -206,7 +206,7 @@ gconv_end (struct __gconv_step *data)
 		  {							      \
 		    result = DL_CALL_FCT (step_data->__trans.__trans_fct,     \
 					  (step, step_data, *inptrp, &inptr,  \
-					   inend, &outbuf, irreversible));    \
+					   inend, &outptr, irreversible));    \
 		    if (result != __GCONV_OK)				      \
 		      break;						      \
 		  }							      \
@@ -249,7 +249,7 @@ gconv_end (struct __gconv_step *data)
 		  {							      \
 		    result = DL_CALL_FCT (step_data->__trans.__trans_fct,     \
 					  (step, step_data, *inptrp, &inptr,  \
-					   inend, &outbuf, irreversible));    \
+					   inend, &outptr, irreversible));    \
 		    if (result != __GCONV_OK)				      \
 		      break;						      \
 		  }							      \