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

diff --git a/localedata/tests-mbwc/dat_wcscoll.c b/localedata/tests-mbwc/dat_wcscoll.c
index ffedacab1e..a9ef9abc9e 100644
--- a/localedata/tests-mbwc/dat_wcscoll.c
+++ b/localedata/tests-mbwc/dat_wcscoll.c
@@ -22,20 +22,20 @@
  *	   if the return value is positive when cmp_flg=+1.
  *    c) When a negative value is expected as a return value,
  *	 ......
- *    d) When data contains invalid values, set err_flg=1.
+ *    d) When data contains invalid values, set err_val to the expected errno.
  *	 Set ret_flg=0 and cmp_flg=0 so that it doesn't compare
  *	 the return value with an expected value or doesn't check
  *	 the sign of the return value.
  *
  *
- *	     ----------------------------------------------------
- *	     CASE  err_flg  err_val   ret_flg  ret_val	 cmp_flg
- *	     ----------------------------------------------------
- *	      a)      0	       0	 1	  0	    0
- *	      b)      0	       0	 0	  0	   +1
- *	      c)      0	       0	 0	  0	   -1
- *	      d)      1	     EINVAL	 0	  0	    0
- *	     ----------------------------------------------------
+ *	     -------------------------------------------
+ *	     CASE  err_val   ret_flg  ret_val	 cmp_flg
+ *	     -------------------------------------------
+ *	      a)      0	 1	  0	    0
+ *	      b)      0	 0	  0	   +1
+ *	      c)      0	 0	  0	   -1
+ *	      d)    EINVAL	 0	  0	    0
+ *	     -------------------------------------------
  */
 
 
@@ -45,43 +45,43 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
 	{
 	  { /*input.*/ { { 0x00E1,0x00E2,0x00E3,0x0000 },
 			 { 0x00E1,0x00E2,0x00E3,0x0000 }, },  /* #1 */
-	    /*expect*/ { 0,0,1,0, 0,			  },
+	    /*expect*/ { 0,1,0, 0,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x00E1,0x00E3,0x0000 },
 			 { 0x0000,0x00E2,0x00E3,0x0000 }, },  /* #2 */
-	    /*expect*/ { 0,0,1,0, 0,			  },
+	    /*expect*/ { 0,1,0, 0,			  },
 	  },
 	  { /*input.*/ { { 0x00E1,0x00E1,0x00E3,0x0000 },
 			 { 0x0000,0x00E2,0x00E3,0x0000 }, },  /* #3 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x00E2,0x00E3,0x0000 },
 			 { 0x00E1,0x00E1,0x00E3,0x0000 }, },  /* #4 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 	  { /*input.*/ { { 0x00E1,0x0042,0x00E3,0x0000 },
 			 { 0x00E1,0x0061,0x00E3,0x0000 }, },  /* #5 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 	  { /*input.*/ { { 0x00E1,0x0061,0x00E3,0x0000 },
 			 { 0x00E1,0x0042,0x00E3,0x0000 }, },  /* #6 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 	  { /*input.*/ { { 0x00E1,0x00E2,0x0000	       },
 			 { 0x00E1,0x00E2,0x00E9,0x0000 }, },  /* #7 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 	  { /*input.*/ { { 0x00E1,0x00E2,0x00E9,0x0000 },
 			 { 0x00E1,0x00E2,0x0000	       }, },  /* #8 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 	  { /*input.*/ { { 0x00E1,0x0092,0x00E9,0x0000 },
 			 { 0x00E1,0x008E,0x00E9,0x0000 }, },  /* #9 */
-	    /*expect*/ { 1,0,0,0, +1,		       },
+	    /*expect*/ { 0,0,0, +1,		       },
 	  },
 	  { /*input.*/ { { 0x00E1,0x008E,0x00E9,0x0000 },
 			 { 0x00E1,0x0092,0x00E9,0x0000 }, },  /* #10 */
-	    /*expect*/ { 0,0,0,0, -1,		       },
+	    /*expect*/ { 0,0,0, -1,		       },
 	  },
 	  { is_last: 1 }
 	}
@@ -90,68 +90,68 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
 	{
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0041,0x0042,0x0043,0x0000 }, },  /* #1 */
-	    /*expect*/ { 0,0,1,0, 0,			  },
+	    /*expect*/ { 0,1,0, 0,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x0041,0x0043,0x0000 },
 			 { 0x0000,0x0042,0x0043,0x0000 }, },  /* #2 */
-	    /*expect*/ { 0,0,1,0, 0,			  },
+	    /*expect*/ { 0,1,0, 0,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0041,0x0043,0x0000 },
 			 { 0x0000,0x0042,0x0043,0x0000 }, },  /* #3 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 },
 			 { 0x0041,0x0041,0x0043,0x0000 }, },  /* #4 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 #ifdef SHOJI_IS_RIGHT
 	  /* <WAIVER> */ /* assume ascii */
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0041,0x0061,0x0043,0x0000 }, },  /* #5 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 	  /* <WAIVER> */ /* assume ascii */
 	  { /*input.*/ { { 0x0041,0x0061,0x0043,0x0000 },
 			 { 0x0041,0x0042,0x0043,0x0000 }, },  /* #6 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 #else
 	  /* XXX Correct order is lowercase before uppercase.  */
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0041,0x0061,0x0043,0x0000 }, },  /* #5 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0061,0x0043,0x0000 },
 			 { 0x0041,0x0042,0x0043,0x0000 }, },  /* #6 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 #endif
 	  { /*input.*/ { { 0x0041,0x0042,0x0000	       },
 			 { 0x0041,0x0042,0x0049,0x0000 }, },  /* #7 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 	  { /*input.*/ { { 0x0041,0x0042,0x0049,0x0000 },
 			 { 0x0041,0x0042,0x0000	       }, },  /* #8 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 #ifdef SHOJI_IS_RIGHT
 	  { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 },
 			 { 0x0041,0x008E,0x0049,0x0000 }, },  /* #9 */
-	    /*expect*/ { 1,0,0,0, +1,		       },
+	    /*expect*/ { 0,0,0, +1,		       },
 	  },
 	  { /*input.*/ { { 0x0041,0x008E,0x0049,0x0000 },
 			 { 0x0041,0x0092,0x0049,0x0000 }, },  /* #10 */
-	    /*expect*/ { 0,0,0,0, -1,		       },
+	    /*expect*/ { 0,0,0, -1,		       },
 	  },
 #else
 	  /* Do not assume position of character out of range.  */
 	  { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 },
 			 { 0x0041,0x008E,0x0049,0x0000 }, },  /* #9 */
-	    /*expect*/ { 1,0,0,0, 0,		       },
+	    /*expect*/ { 0,0,0, 0,		       },
 	  },
 	  { /*input.*/ { { 0x0041,0x008E,0x0049,0x0000 },
 			 { 0x0041,0x0092,0x0049,0x0000 }, },  /* #10 */
-	    /*expect*/ { 0,0,0,0, 0,		       },
+	    /*expect*/ { 0,0,0, 0,		       },
 	  },
 #endif
 	  { is_last: 1 }
@@ -161,43 +161,43 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
 	{
 	  { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 },
 			 { 0x3041,0x3042,0x3043,0x0000 }, },  /* #1 */
-	    /*expect*/ { 0,0,1,0, 0,			  },
+	    /*expect*/ { 0,1,0, 0,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x3041,0x3043,0x0000 },
 			 { 0x0000,0x3042,0x3043,0x0000 }, },  /* #2 */
-	    /*expect*/ { 0,0,1,0, 0,			  },
+	    /*expect*/ { 0,1,0, 0,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3041,0x3043,0x0000 },
 			 { 0x0000,0x3042,0x3043,0x0000 }, },  /* #3 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 	  { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 },
 			 { 0x3041,0x3041,0x3043,0x0000 }, },  /* #4 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x0042,0x3043,0x0000 },
 			 { 0x3041,0x0061,0x3043,0x0000 }, },  /* #5 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x0061,0x3043,0x0000 },
 			 { 0x3041,0x0042,0x3043,0x0000 }, },  /* #6 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0xFF71,0x0000 },
 			 { 0x3041,0x3042,0x30A2,0x0000 }, },  /* #7 */
-	    /*expect*/ { 0,0,0,0, -1,			  },
+	    /*expect*/ { 0,0,0, -1,			  },
 	  },
 	  { /*input.*/ { { 0x3041,0x3042,0x30A2,0x0000 },
 			 { 0x3041,0x3042,0xFF71,0x0000 }, },  /* #8 */
-	    /*expect*/ { 0,0,0,0, +1,			  },
+	    /*expect*/ { 0,0,0, +1,			  },
 	  },
 	  { /*input.*/ { { 0x30FF,0x3092,0x3049,0x0000 },
 			 { 0x3041,0x308E,0x3049,0x0000 }, },  /* #9 */
-	    /*expect*/ { 0,0,0,0, -1,		       },
+	    /*expect*/ { 0,0,0, -1,		       },
 	  },
 	  { /*input.*/ { { 0x3041,0x308E,0x3049,0x0000 },
 			 { 0x30FF,0x3092,0x3049,0x0000 }, },  /* #10 */
-	    /*expect*/ { 0,0,0,0, +1,		       },
+	    /*expect*/ { 0,0,0, +1,		       },
 	  },
 	  { is_last: 1 }
 	}