* tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg.

(TST_DECL_VARS): Don't declare err_flg. 
(TST_GET_ERRET): Don't set err_flg. 
(TST_GET_ERRET_SEQ): Likewise. 
(TST_IF_RETURN): Don't use err_flg, check err_exp directly.
	* tests-mbwc/dat_swscanf.c: Don't set err_flg.
	* tests-mbwc/dat_iswalnum.c: Likewise.
	* tests-mbwc/dat_iswalpha.c: Likewise.
	* tests-mbwc/dat_iswcntrl.c: Likewise.
	* tests-mbwc/dat_iswctype.c: Likewise.
	* tests-mbwc/dat_iswdigit.c: Likewise.
	* tests-mbwc/dat_iswgraph.c: Likewise.
	* tests-mbwc/dat_iswlower.c: Likewise.
	* tests-mbwc/dat_iswprint.c: Likewise.
	* tests-mbwc/dat_iswpunct.c: Likewise.
	* tests-mbwc/dat_iswspace.c: Likewise.
	* tests-mbwc/dat_iswupper.c: Likewise.
	* tests-mbwc/dat_iswxdigit.c: Likewise.
	* tests-mbwc/dat_mblen.c: Likewise.
	* tests-mbwc/dat_mbrlen.c: Likewise.
	* tests-mbwc/dat_mbrtowc.c: Likewise.
	* tests-mbwc/dat_mbsrtowcs.c: Likewise.
	* tests-mbwc/dat_mbstowcs.c: Likewise.
	* tests-mbwc/dat_mbtowc.c: Likewise.
	* tests-mbwc/dat_strcoll.c: Likewise.
	* tests-mbwc/dat_strfmon.c: Likewise.
	* tests-mbwc/dat_strxfrm.c: Likewise.
	* tests-mbwc/dat_swscanf.c: Likewise.
	* tests-mbwc/dat_towctrans.c: Likewise.
	* tests-mbwc/dat_towlower.c: Likewise.
	* tests-mbwc/dat_towupper.c: Likewise.
	* tests-mbwc/dat_wcrtomb.c: Likewise.
	* tests-mbwc/dat_wcscat.c: Likewise.
	* tests-mbwc/dat_wcschr.c: Likewise.
	* tests-mbwc/dat_wcscmp.c: Likewise.
	* tests-mbwc/dat_wcscoll.c: Likewise.
	* tests-mbwc/dat_wcscpy.c: Likewise.
	* tests-mbwc/dat_wcscspn.c: Likewise.
	* tests-mbwc/dat_wcslen.c: Likewise.
	* tests-mbwc/dat_wcsncat.c: Likewise.
	* tests-mbwc/dat_wcsncmp.c: Likewise.
	* tests-mbwc/dat_wcsncpy.c: Likewise.
	* tests-mbwc/dat_wcspbrk.c: Likewise.
	* tests-mbwc/dat_wcsrtombs.c: Likewise.
	* tests-mbwc/dat_wcsspn.c: Likewise.
	* tests-mbwc/dat_wcsstr.c: Likewise.
	* tests-mbwc/dat_wcstod.c: Likewise.
	* tests-mbwc/dat_wcstok.c: Likewise.
	* tests-mbwc/dat_wcstombs.c: Likewise.
	* tests-mbwc/dat_wcswidth.c: Likewise.
	* tests-mbwc/dat_wcsxfrm.c: Likewise.
	* tests-mbwc/dat_wctob.c: Likewise.
	* tests-mbwc/dat_wctomb.c: Likewise.
	* tests-mbwc/dat_wctrans.c: Likewise.
	* tests-mbwc/dat_wctype.c: Likewise.
	* tests-mbwc/dat_wcwidth.c: Likewise.
	* tests-mbwc/dat_isw-funcs.h: Fix comment.
2000-08-18  Andreas Jaeger  <aj@suse.de>

	* tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg.
	(TST_DECL_VARS): Don't declare err_flg.
	(TST_GET_ERRET): Don't set err_flg.
	(TST_GET_ERRET_SEQ): Likewise.
	(TST_IF_RETURN): Don't use err_flg, check err_exp directly.

	* tests-mbwc/dat_swscanf.c: Don't set err_flg.
	* tests-mbwc/dat_iswalnum.c: Likewise.
	* tests-mbwc/dat_iswalpha.c: Likewise.
	* tests-mbwc/dat_iswcntrl.c: Likewise.
	* tests-mbwc/dat_iswctype.c: Likewise.
	* tests-mbwc/dat_iswdigit.c: Likewise.
	* tests-mbwc/dat_iswgraph.c: Likewise.
	* tests-mbwc/dat_iswlower.c: Likewise.
	* tests-mbwc/dat_iswprint.c: Likewise.
	* tests-mbwc/dat_iswpunct.c: Likewise.
	* tests-mbwc/dat_iswspace.c: Likewise.
	* tests-mbwc/dat_iswupper.c: Likewise.
	* tests-mbwc/dat_iswxdigit.c: Likewise.
	* tests-mbwc/dat_mblen.c: Likewise.
	* tests-mbwc/dat_mbrlen.c: Likewise.
	* tests-mbwc/dat_mbrtowc.c: Likewise.
	* tests-mbwc/dat_mbsrtowcs.c: Likewise.
	* tests-mbwc/dat_mbstowcs.c: Likewise.
	* tests-mbwc/dat_mbtowc.c: Likewise.
	* tests-mbwc/dat_strcoll.c: Likewise.
	* tests-mbwc/dat_strfmon.c: Likewise.
	* tests-mbwc/dat_strxfrm.c: Likewise.
	* tests-mbwc/dat_swscanf.c: Likewise.
	* tests-mbwc/dat_towctrans.c: Likewise.
	* tests-mbwc/dat_towlower.c: Likewise.
	* tests-mbwc/dat_towupper.c: Likewise.
	* tests-mbwc/dat_wcrtomb.c: Likewise.
	* tests-mbwc/dat_wcscat.c: Likewise.
	* tests-mbwc/dat_wcschr.c: Likewise.
	* tests-mbwc/dat_wcscmp.c: Likewise.
	* tests-mbwc/dat_wcscoll.c: Likewise.
	* tests-mbwc/dat_wcscpy.c: Likewise.
	* tests-mbwc/dat_wcscspn.c: Likewise.
	* tests-mbwc/dat_wcslen.c: Likewise.
	* tests-mbwc/dat_wcsncat.c: Likewise.
	* tests-mbwc/dat_wcsncmp.c: Likewise.
	* tests-mbwc/dat_wcsncpy.c: Likewise.
	* tests-mbwc/dat_wcspbrk.c: Likewise.
	* tests-mbwc/dat_wcsrtombs.c: Likewise.
	* tests-mbwc/dat_wcsspn.c: Likewise.
	* tests-mbwc/dat_wcsstr.c: Likewise.
	* tests-mbwc/dat_wcstod.c: Likewise.
	* tests-mbwc/dat_wcstok.c: Likewise.
	* tests-mbwc/dat_wcstombs.c: Likewise.
	* tests-mbwc/dat_wcswidth.c: Likewise.
	* tests-mbwc/dat_wcsxfrm.c: Likewise.
	* tests-mbwc/dat_wctob.c: Likewise.
	* tests-mbwc/dat_wctomb.c: Likewise.
	* tests-mbwc/dat_wctrans.c: Likewise.
	* tests-mbwc/dat_wctype.c: Likewise.
	* tests-mbwc/dat_wcwidth.c: Likewise.
	* tests-mbwc/dat_isw-funcs.h: Fix comment.

1 files changed, 15 insertions, 15 deletions

diff --git a/localedata/tests-mbwc/dat_wcrtomb.c b/localedata/tests-mbwc/dat_wcrtomb.c
index 529232396f..e256363111 100644
--- a/localedata/tests-mbwc/dat_wcrtomb.c
+++ b/localedata/tests-mbwc/dat_wcrtomb.c
@@ -13,23 +13,23 @@ TST_WCRTOMB tst_wcrtomb_loc [] = {
     {
       /* #01 : normal case			       */
       { /*input.*/ { 1,		 0x00FC,   0,0 },
-	/*expect*/ { 1,0,	   1,1,	 "ü"	       },
+	/*expect*/ { 0,	   1,1,	 "ü"	       },
       },
       /* #02 : normal case			       */
       { /*input.*/ { 1,		 0x00D6,   0,0 },
-	/*expect*/ { 1,0,	   1,1,	 "Ö"	       },
+	/*expect*/ { 0,	   1,1,	 "Ö"	       },
       },
       /* #03 : error case			       */
       { /*input.*/ { 1,		 0xFFA1,   0,0 },
-	/*expect*/ { 1, EILSEQ,1,-1, ""	       },
+	/*expect*/ {  EILSEQ,1,-1, ""	       },
       },
       /* #04 :				       */
       { /*input.*/ { 0,		 0x0041,   0,0 },
-	/*expect*/ { 1,0,	   1,1,	 ""	       },
+	/*expect*/ { 0,	   1,1,	 ""	       },
       },
       /* #05 :				       */
       { /*input.*/ { 0,		 0x0092,   0,0 },
-	/*expect*/ { 1,0,	   1,1,	 ""	       },
+	/*expect*/ { 0,	   1,1,	 ""	       },
       },
       { is_last: 1 }
     }
@@ -39,24 +39,24 @@ TST_WCRTOMB tst_wcrtomb_loc [] = {
     {
       /* #01 : normal case			       */
       { /*input.*/ { 1,		 0x0041,   0,0 },
-	/*expect*/ { 0,0,	   1,1,	 "A"	       },
+	/*expect*/ { 0,	   1,1,	 "A"	       },
       },
       /* #02 : normal case			       */
       { /*input.*/ { 1,		 0x0042,   0,0 },
-	/*expect*/ { 0,0,	   1,1,	 "B"	       },
+	/*expect*/ { 0,	   1,1,	 "B"	       },
       },
       /* #03 : error case			       */
       /* <WAIVER> x 2 */
       { /*input.*/ { 1,		 0x0092,   0,0 },  /* assume ascii */
-	/*expect*/ { 1, EILSEQ,1,-1, ""	       },
+	/*expect*/ {  EILSEQ,1,-1, ""	       },
       },
       /* #04 :				       */
       { /*input.*/ { 0,		 0x0041,   0,0 },
-	/*expect*/ { 1,0,	   1,1,	 ""	       },
+	/*expect*/ { 0,	   1,1,	 ""	       },
       },
       /* #05 :				       */
       { /*input.*/ { 0,		 0x0092,   0,0 },
-	/*expect*/ { 1,0,	   1,1,	 ""	       },
+	/*expect*/ { 0,	   1,1,	 ""	       },
       },
       { is_last: 1 }
     }
@@ -66,23 +66,23 @@ TST_WCRTOMB tst_wcrtomb_loc [] = {
     {
       /* #01 : normal case			       */
       { /*input.*/ { 1,		 0x3042,   0,0 },
-	/*expect*/ { 0,0,      1,2,  "\244\242"	   },
+	/*expect*/ { 0,      1,2,  "\244\242"	   },
       },
       /* #02 : normal case			       */
       { /*input.*/ { 1,		 0x3044,   0,0 },
-	/*expect*/ { 0,0,      1,2,  "\244\244"	   },
+	/*expect*/ { 0,      1,2,  "\244\244"	   },
       },
       /* #03 : normal case			       */
       { /*input.*/ { 1,		 0x008E,   0,0 },
-	/*expect*/ { 1,EILSEQ, 1,-1, ""	       },
+	/*expect*/ { EILSEQ, 1,-1, ""	       },
       },
       /* #04 :				       */
       { /*input.*/ { 0,		 0x3042,   0,0 },
-	/*expect*/ { 1,0,	   0,0,	 ""	       },
+	/*expect*/ { 0,	   0,0,	 ""	       },
       },
       /* #05 :				       */
       { /*input.*/ { 0,		 0x008E,   0,0 },
-	/*expect*/ { 1,0,	   0,0,	 ""	       },
+	/*expect*/ { 0,	   0,0,	 ""	       },
       },
       { is_last: 1 }
     }