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

diff --git a/localedata/tests-mbwc/dat_towctrans.c b/localedata/tests-mbwc/dat_towctrans.c
index 1ed53d08cc..9b632c4d20 100644
--- a/localedata/tests-mbwc/dat_towctrans.c
+++ b/localedata/tests-mbwc/dat_towctrans.c
@@ -39,13 +39,13 @@ TST_TOWCTRANS tst_towctrans_loc [] = {
     { Ttowctrans, TST_LOC_C },
     {
 #ifdef SHOJI_IS_RIGHT
-      {	 { 0x0010, "xxxxxxx" }, { 1,EINVAL,1,0x0010 }  },
-#else
-      {	 { 0x0010, "xxxxxxx" }, { 1,0,     1,0x0010 }  },
-#endif
-      {	 { 0x007F, "tolower" }, { 1,0,	   1,0x007F }  },
-      {	 { 0x0061, "toupper" }, { 1,0,	   1,0x0041 }  },
-      {	 { 0x0041, "tolower" }, { 1,0,	   1,0x0061 }  },
+      {	 { 0x0010, "xxxxxxx" }, { EINVAL,1,0x0010 }  },
+#else				  
+      {	 { 0x0010, "xxxxxxx" }, { 0,     1,0x0010 }  },
+#endif				  
+      {	 { 0x007F, "tolower" }, { 0,	   1,0x007F }  },
+      {	 { 0x0061, "toupper" }, { 0,	   1,0x0041 }  },
+      {	 { 0x0041, "tolower" }, { 0,	   1,0x0061 }  },
       { is_last: 1 }
     }
   },
@@ -53,37 +53,37 @@ TST_TOWCTRANS tst_towctrans_loc [] = {
     { Ttowctrans, TST_LOC_de },
     {
 #ifdef SHOJI_IS_RIGHT
-      {	 { 0x0010, "tojkata" }, { 1,EINVAL,1,0x0010 }  },
-#else
-      {	 { 0x0010, "tojkata" }, { 1,0,     1,0x0010 }  },
-#endif
-      {	 { 0x0080, "tolower" }, { 1,0,	   1,0x0080 }  },
-      {	 { 0x00EC, "toupper" }, { 1,0,	   1,0x00CC }  },
-      {	 { 0x00CC, "tolower" }, { 1,0,	   1,0x00EC }  },
-      { is_last: 1 }
-    }
-  },
-  {
-    { Ttowctrans, TST_LOC_enUS },
-    {
-#ifdef SHOJI_IS_RIGHT
-      {	 { 0x0010, "xxxxxxx" }, { 1,EINVAL,1,0x0010 }  },
-#else
-      {	 { 0x0010, "xxxxxxx" }, { 1,0,     1,0x0010 }  },
-#endif
-      {	 { 0x007F, "tolower" }, { 1,0,	   1,0x007F }  },
-      {	 { 0x0061, "toupper" }, { 1,0,	   1,0x0041 }  },
-      {	 { 0x0041, "tolower" }, { 1,0,	   1,0x0061 }  },
-      { is_last: 1 }
-    }
-  },
-  {
+      {	 { 0x0010, "tojkata" }, { EINVAL,1,0x0010 }  },
+#else				  
+      {	 { 0x0010, "tojkata" }, { 0,     1,0x0010 }  },
+#endif				  
+      {	 { 0x0080, "tolower" }, { 0,	   1,0x0080 }  },
+      {	 { 0x00EC, "toupper" }, { 0,	   1,0x00CC }  },
+      {	 { 0x00CC, "tolower" }, { 0,	   1,0x00EC }  },
+      { is_last: 1 }		  
+    }				  
+  },				  
+  {				  
+    { Ttowctrans, TST_LOC_enUS }, 
+    {				  
+#ifdef SHOJI_IS_RIGHT		  
+      {	 { 0x0010, "xxxxxxx" }, { EINVAL,1,0x0010 }  },
+#else				  
+      {	 { 0x0010, "xxxxxxx" }, { 0,     1,0x0010 }  },
+#endif				  
+      {	 { 0x007F, "tolower" }, { 0,	   1,0x007F }  },
+      {	 { 0x0061, "toupper" }, { 0,	   1,0x0041 }  },
+      {	 { 0x0041, "tolower" }, { 0,	   1,0x0061 }  },
+      { is_last: 1 }		  
+    }				  
+  },				  
+  {				  
     { Ttowctrans, TST_LOC_eucJP },
-    {
-      {	 { 0xFF21, "tolower" }, { 1,0,	   1,0xFF41 }  },
-      {	 { 0xFF41, "toupper" }, { 1,0,	   1,0xFF21 }  },
-      {	 { 0x30A1, "tojhira" }, { 1,0,	   1,0x3041 }  },
-      {	 { 0x3041, "tojkata" }, { 1,0,	   1,0x30A1 }  },
+    {				  
+      {	 { 0xFF21, "tolower" }, { 0,	   1,0xFF41 }  },
+      {	 { 0xFF41, "toupper" }, { 0,	   1,0xFF21 }  },
+      {	 { 0x30A1, "tojhira" }, { 0,	   1,0x3041 }  },
+      {	 { 0x3041, "tojkata" }, { 0,	   1,0x30A1 }  },
       { is_last: 1 }
     }
   },