* 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, 33 insertions, 33 deletions

diff --git a/localedata/tests-mbwc/dat_wcscspn.c b/localedata/tests-mbwc/dat_wcscspn.c
index 0b2e1e7..ba166f6 100644
--- a/localedata/tests-mbwc/dat_wcscspn.c
+++ b/localedata/tests-mbwc/dat_wcscspn.c
@@ -13,47 +13,47 @@ TST_WCSCSPN tst_wcscspn_loc [] = {
 	{
 	  { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 },
 			 { 0x00D1,0x0000	       }, },  /* #1 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 },
 			 {	  0x00D2,0x0000	       }, },  /* #2 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 },
 			 {		 0x00D3,0x0000 }, },  /* #3 */
-	    /*expect*/ { 0,0,1,2,			  },
+	    /*expect*/ { 0,1,2,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 },
 			 {	  0x00D2,0x00D3,0x0000 }, },  /* #4 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 },
 			 { 0x00D2,0x00D3,0x00D4,0x0000 }, },  /* #5 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 },
 			 { 0x00D3,0x00D4,0x00D5,0x0000 }, },  /* #6 */
-	    /*expect*/ { 0,0,1,2,			  },
+	    /*expect*/ { 0,1,2,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 },
 			 { 0x00D1,0x00D2,0x00D3,0x0000 }, },  /* #7 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 },
 			 { 0x00D2,0x000		       }, },  /* #8 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 },
 			 { 0x0000,0x00D2,0x00D3,0x0000 }, },  /* #9 */
-	    /*expect*/ { 0,0,1,3,			  },
+	    /*expect*/ { 0,1,3,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x0000	       },
 			 { 0x00D1,0x00D2,0x00D3,0x0000 }, },  /* #10 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x00D1,0x00D2,0x0000	       },
 			 { 0x00D1,0x00D3,0x00D4,0x0000 }, },  /* #11 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { is_last: 1 }
 	}
@@ -62,47 +62,47 @@ TST_WCSCSPN tst_wcscspn_loc [] = {
 	{
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0041,0x0000	       }, },  /* #1 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 {	  0x0042,0x0000	       }, },  /* #2 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 {		 0x0043,0x0000 }, },  /* #3 */
-	    /*expect*/ { 0,0,1,2,			  },
+	    /*expect*/ { 0,1,2,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 {	  0x0042,0x0043,0x0000 }, },  /* #4 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0042,0x0043,0x0044,0x0000 }, },  /* #5 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0043,0x0044,0x0045,0x0000 }, },  /* #6 */
-	    /*expect*/ { 0,0,1,2,			  },
+	    /*expect*/ { 0,1,2,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0041,0x0042,0x0043,0x0000 }, },  /* #7 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 },
 			 { 0x0042,0x000		       }, },  /* #8 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0000,0x0042,0x0043,0x0000 }, },  /* #9 */
-	    /*expect*/ { 0,0,1,3,			  },
+	    /*expect*/ { 0,1,3,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0000	       },
 			 { 0x0041,0x0042,0x0043,0x0000 }, },  /* #10 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0000	       },
 			 { 0x0041,0x0043,0x0044,0x0000 }, },  /* #11 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { is_last: 1 }
 	}
@@ -111,47 +111,47 @@ TST_WCSCSPN tst_wcscspn_loc [] = {
 	{
 	  { /*input.*/ { { 0x3041,0x3042,0x0043,0x0000 },
 			 { 0x3041,0x0000	       }, },  /* #1 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x0043,0x0000 },
 			 {	  0x3042,0x0000	       }, },  /* #2 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },
 			 {		 0x3043,0x0000 }, },  /* #3 */
-	    /*expect*/ { 0,0,1,2,			  },
+	    /*expect*/ { 0,1,2,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },
 			 {	  0x3042,0x3043,0x0000 }, },  /* #4 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },
 			 { 0x3042,0x3043,0x3044,0x0000 }, },  /* #5 */
-	    /*expect*/ { 0,0,1,1,			  },
+	    /*expect*/ { 0,1,1,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },
 			 { 0x3043,0x3044,0x3045,0x0000 }, },  /* #6 */
-	    /*expect*/ { 0,0,1,2,			  },
+	    /*expect*/ { 0,1,2,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },
 			 { 0x3041,0x3042,0x3043,0x0000 }, },  /* #7 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 },
 			 { 0x3042,0x0000	       }, },  /* #8 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },
 			 { 0x0000,0x3042,0x3043,0x0000 }, },  /* #9 */
-	    /*expect*/ { 0,0,1,3,			  },
+	    /*expect*/ { 0,1,3,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x0000	       },
 			 { 0x3041,0x3042,0x3043,0x0000 }, },  /* #10 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x0000	       },
 			 { 0x3041,0x3043,0x3044,0x0000 }, },  /* #11 */
-	    /*expect*/ { 0,0,1,0,			  },
+	    /*expect*/ { 0,1,0,			  },
 	  },
 	  { is_last: 1 }
 	}