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

diff --git a/localedata/tests-mbwc/dat_swscanf.c b/localedata/tests-mbwc/dat_swscanf.c
index cce5b336e6..96f6c67c0b 100644
--- a/localedata/tests-mbwc/dat_swscanf.c
+++ b/localedata/tests-mbwc/dat_swscanf.c
@@ -28,7 +28,9 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%d:%u:%f:%c:%s", 0
       },
-	{ 1,0,1,5,
+	{ /* The fields are: err_val, ret_flag, ret_val,
+	     val_int, val_uns, val_flt, val_c, val_s, val_S.  */
+	  0,1,5,
 	  -1, 2, 3.3, 'ä', "ÄÜ", { 0x0000, },
 	},
       },
@@ -38,7 +40,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%lc", 'C'
       },
-	{ 1,0,1,1,
+	{ 0,1,1,
 	  0,0,0,0,"", { 0x00E4, 0x0000 },
 	},
       },
@@ -48,7 +50,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%ls", 'S'
       },
-	{ 1,0,1,1,
+	{ 0,1,1,
 	  0,0,0,0,"", { 0x00E4, 0x00C4, 0x0000 },
 	},
       },
@@ -63,7 +65,7 @@ TST_SWSCANF tst_swscanf_loc [] =
 	{ 1,EINVAL,1,WEOF,
 	  0,0,0,0,"", { 0x0000 },
 #else
-	{ 0,0,1,0,
+	{ 0,1,0,
 	  0,0,0,0,"", { 0x0000 },
 #endif
 	},
@@ -84,7 +86,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%d:%u:%f:%c:%s", 0
       },
-	{ 1,0,1,5,
+	{ 0,1,5,
 	  -1, 2, 5.43, 'A', "ab", { 0x0000 },
 	},
       },
@@ -95,7 +97,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%C", 'C'
       },
-	{ 1,0,1,1,
+	{ 0,1,1,
 	  0,0,0,0,"", { 0x0063, 0x0000 },
 	},
       },
@@ -105,7 +107,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%S", 'S'
       },
-	{ 1,0,1,1,
+	{ 0,1,1,
 	  0,0,0,0,"", { 0x0063, 0x0064, 0x0000 },
 	},
       },
@@ -125,7 +127,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%d:%u:%f:%c:%s", 0
       },
-	{ 1,0,1,5,
+	{ 0,1,5,
 	  -1, 2, 3.3, 'b', "ab", { 0x0000 }
 	},
       },
@@ -135,7 +137,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%ls", 'S'
       },
-	{ 1,0,1,1,
+	{ 0,1,1,
 	  0,0,0,0,"", { 0x30A2, 0x30A4, 0x0000 }
 	},
       },
@@ -149,7 +151,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"%2$d:%1$u:%3$f:%4$c:%5$s", 0
       },
-	{ 1,0,1,5,
+	{ 0,1,5,
 	  0, 1, 3.9, 'a', "cd", { 0x0000 }
 	},
       },
@@ -164,7 +166,7 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  { 0x0001,0x0002,0x0025,0x0053,0x0000 }, 'S'
       },
-	{ 1,EILSEQ,1,EOF,
+	{ EILSEQ,1,EOF,
 	  0,0,0,0,"", { 0x0000 }
 	},
       },