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

diff --git a/localedata/tests-mbwc/dat_wcswidth.c b/localedata/tests-mbwc/dat_wcswidth.c
index a1c7076e60..fd426ef2c1 100644
--- a/localedata/tests-mbwc/dat_wcswidth.c
+++ b/localedata/tests-mbwc/dat_wcswidth.c
@@ -11,64 +11,64 @@ TST_WCSWIDTH tst_wcswidth_loc [] = {
     { Twcswidth, TST_LOC_de },
     {
       { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 },	 0 },  /* 01 */
-	/*expect*/ { 0,0,1,0				   },
+	/*expect*/ { 0,1,0				   },
       },
       { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 },	 1 },  /* 02 */
-	/*expect*/ { 0,0,1,1				   },
+	/*expect*/ { 0,1,1				   },
       },
       { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 },	 2 },  /* 03 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 },	 3 },  /* 04 */
-	/*expect*/ { 0,0,1,3				   },
+	/*expect*/ { 0,1,3				   },
       },
       { /*input.*/ { { 0x00C1,0x00C2,0x00C3,0x0000 },	 4 },  /* 05 */
-	/*expect*/ { 0,0,1,3				   },
+	/*expect*/ { 0,1,3				   },
       },
       { /*input.*/ { { 0x0000 },			 1 },  /* 06 */
-	/*expect*/ { 0,0,1,0				   },
+	/*expect*/ { 0,1,0				   },
       },
       { /*input.*/ { { 0x00C1,0x0001,0x0000 },		 2 },  /* 07 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x00C1,0x0001,0x0000 },		 1 },  /* 08 */
-	/*expect*/ { 0,0,1,1				   },
+	/*expect*/ { 0,1,1				   },
       },
       { /*input.*/ { { 0x00C1,0x0001,0x0000 },		 2 },  /* 09 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x00C1,0x0092,0x0000 },		 2 },  /* 10 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x00C1,0x0020,0x0000 },		 2 },  /* 11 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x00C1,0x0021,0x0000 },		 2 },  /* 12 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x00C1,0x007E,0x0000 },		 2 },  /* 13 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x00C1,0x007F,0x0000 },		 2 },  /* 14 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x00C1,0x0080,0x0000 },		 2 },  /* 15 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x00C1,0x00A0,0x0000 },		 2 },  /* 16 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x00C1,0x00A1,0x0000 },		 2 },  /* 17 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x00C1,0x00FF,0x0000 },		 2 },  /* 18 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x00C1,0x3042,0x0000 },		 2 },  /* 19 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x00C1,0x3044,0x0000 },		 2 },  /* 20 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { is_last: 1 }
     }
@@ -77,82 +77,82 @@ TST_WCSWIDTH tst_wcswidth_loc [] = {
     { Twcswidth, TST_LOC_enUS },
     {
       { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 },	 0 },  /* 01 */
-	/*expect*/ { 0,0,1,0				   },
+	/*expect*/ { 0,1,0				   },
       },
       { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 },	 1 },  /* 02 */
-	/*expect*/ { 0,0,1,1				   },
+	/*expect*/ { 0,1,1				   },
       },
       { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 },	 2 },  /* 03 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
 #ifdef SHOJI_IS_RIGHT
       { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 },	 3 },  /* 04 */
-	/*expect*/ { 0,0,1,3				   },
+	/*expect*/ { 0,1,3				   },
       },
       { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 },	 4 },  /* 05 */
-	/*expect*/ { 0,0,1,3				   },
+	/*expect*/ { 0,1,3				   },
       },
 #else
       { /*input.*/ { { 0x0041,0x0042,0x00C3,0x0000 },	 3 },  /* 04 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },	 4 },  /* 05 */
-	/*expect*/ { 0,0,1,3				   },
+	/*expect*/ { 0,1,3				   },
       },
 #endif
       { /*input.*/ { { 0x0000 },			 1 },  /* 06 */
-	/*expect*/ { 0,0,1,0				   },
+	/*expect*/ { 0,1,0				   },
       },
       { /*input.*/ { { 0x0041,0x0001,0x0000 },		 2 },  /* 07 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x0001,0x0000 },		 1 },  /* 08 */
-	/*expect*/ { 0,0,1,1				   },
+	/*expect*/ { 0,1,1				   },
       },
       { /*input.*/ { { 0x0041,0x0001,0x0000 },		 2 },  /* 09 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x0092,0x0000 },		 2 },  /* 10 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x0020,0x0000 },		 2 },  /* 11 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x0041,0x0021,0x0000 },		 2 },  /* 12 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x0041,0x007E,0x0000 },		 2 },  /* 13 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x0041,0x007F,0x0000 },		 2 },  /* 14 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x0080,0x0000 },		 2 },  /* 15 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x00A0,0x0000 },		 2 },  /* 16 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
 #ifdef SHOJI_IS_RIGHT
       { /*input.*/ { { 0x0041,0x00A1,0x0000 },		 2 },  /* 17 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x0041,0x00FF,0x0000 },		 2 },  /* 18 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
 #else
       { /*input.*/ { { 0x0041,0x007E,0x0000 },		 2 },  /* 17 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x0041,0x0020,0x0000 },		 2 },  /* 18 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
 #endif
       { /*input.*/ { { 0x0041,0x3042,0x0000 },		 2 },  /* 19 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x3044,0x0000 },		 2 },  /* 20 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { is_last: 1 }
     }
@@ -161,72 +161,72 @@ TST_WCSWIDTH tst_wcswidth_loc [] = {
     { Twcswidth, TST_LOC_eucJP },
     {
       { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },	 0 },  /* 01 */
-	/*expect*/ { 0,0,1,0				   },
+	/*expect*/ { 0,1,0				   },
       },
       { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },	 1 },  /* 02 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },	 2 },  /* 03 */
-	/*expect*/ { 0,0,1,4				   },
+	/*expect*/ { 0,1,4				   },
       },
       { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },	 3 },  /* 04 */
-	/*expect*/ { 0,0,1,6				   },
+	/*expect*/ { 0,1,6				   },
       },
       { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },	 4 },  /* 05 */
-	/*expect*/ { 0,0,1,6				   },
+	/*expect*/ { 0,1,6				   },
       },
       { /*input.*/ { { 0x0000 },			 1 },  /* 06 */
-	/*expect*/ { 0,0,1,0				   },
+	/*expect*/ { 0,1,0				   },
       },
       { /*input.*/ { { 0x008E,0x0001,0x0000 },		 2 },  /* 07 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x3041,0x008E,0x0000 },		 1 },  /* 08 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x3041,0x008E,0x0000 },		 2 },  /* 09 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x3041,0x0001,0x0000 },		 2 },  /* 10 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x3041,0x3000,0x0000 },		 2 },  /* 11 */
-	/*expect*/ { 0,0,1,4				   },
+	/*expect*/ { 0,1,4				   },
       },
       { /*input.*/ { { 0x0041,0x0021,0x0000 },		 2 },  /* 12 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x0041,0x007E,0x0000 },		 2 },  /* 13 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x0041,0x007F,0x0000 },		 2 },  /* 14 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x0080,0x0000 },		 2 },  /* 15 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
       { /*input.*/ { { 0x0041,0x00A0,0x0000 },		 2 },  /* 16 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
 #ifdef NO_WAIVER
       /* <NO_WAIVER> */	 /* returns 3 */
       { /*input.*/ { { 0x0041,0x00A1,0x0000 },		 2 },  /* 17 */
-	/*expect*/ { 0,0,1,-1				   },
+	/*expect*/ { 0,1,-1				   },
       },
 #else
       /* XXX U00A1 is valid -> /x8f/xa2/xc4 in JIS X 0212 */
       { /*input.*/ { { 0x0041,0x00A1,0x0000 },		 2 },  /* 17 */
-	/*expect*/ { 0,0,1,3				   },
+	/*expect*/ { 0,1,3				   },
       },
 #endif
       { /*input.*/ { { 0x0041,0xFF71,0x0000 },		 2 },  /* 18 */
-	/*expect*/ { 0,0,1,2				   },
+	/*expect*/ { 0,1,2				   },
       },
       { /*input.*/ { { 0x0041,0x3042,0x0000 },		 2 },  /* 19 */
-	/*expect*/ { 0,0,1,3				   },
+	/*expect*/ { 0,1,3				   },
       },
       { /*input.*/ { { 0x0041,0x3044,0x0000 },		 2 },  /* 20 */
-	/*expect*/ { 0,0,1,3				   },
+	/*expect*/ { 0,1,3				   },
       },
       { is_last: 1 }
     }