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

diff --git a/localedata/tests-mbwc/dat_wcstombs.c b/localedata/tests-mbwc/dat_wcstombs.c
index 0f136b0897..4a7de0b725 100644
--- a/localedata/tests-mbwc/dat_wcstombs.c
+++ b/localedata/tests-mbwc/dat_wcstombs.c
@@ -21,58 +21,58 @@ TST_WCSTOMBS tst_wcstombs_loc [] = {
     {
       /* #01 : Any chars including a null char should not be stored in s.  */
       { /*input.*/ { 1,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 }, 0 },
-	/*expect*/ { 1,0,1,0,	 ""					  },
+	/*expect*/ { 0,1,0,	 ""					  },
       },
       /* #02 : Only one chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 },	1 },
-	/*expect*/ { 1,0,1,1,	 "Ä"					  },
+	/*expect*/ { 0,1,1,	 "Ä"					  },
       },
       /* #03 : Only two chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 },	2 },
-	/*expect*/ { 1,0,1,2,	 "ÄÖ"					  },
+	/*expect*/ { 0,1,2,	 "ÄÖ"					  },
       },
       /* #04 : Only three chars should be stored in s. No null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 },	3 },
-	/*expect*/ { 1,0,1,3,	 "ÄÖÜ"					  },
+	/*expect*/ { 0,1,3,	 "ÄÖÜ"					  },
       },
       /* #05 : Only three chars should be stored in s with a null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 },	4 },
-	/*expect*/ { 1,0,1,3,	 "ÄÖÜ"					  },
+	/*expect*/ { 0,1,3,	 "ÄÖÜ"					  },
       },
       /* #06 : Only three chars should be stored in s with a null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 },	5 },
-	/*expect*/ { 1,0,1,3,	 "ÄÖÜ"					  },
+	/*expect*/ { 0,1,3,	 "ÄÖÜ"					  },
       },
       /* #07 : Invalid mb sequence. No chars should be stored in s. */
       { /*input.*/ { 1,1,	       { 0x0201,0x0221,0x0000,0x0000 },	2 },
-	/*expect*/ { 1,EILSEQ,1,(size_t)-1,	 ""			  },
+	/*expect*/ { EILSEQ,1,(size_t)-1,	 ""			  },
       },
       /* #08 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 }, 0 },
-	/*expect*/ { 1,0,1,3,	 ""					  },
+	/*expect*/ { 0,1,3,	 ""					  },
       },
       /* #09 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 }, 1 },
-	/*expect*/ { 1,0,1,3,	 ""					  },
+	/*expect*/ { 0,1,3,	 ""					  },
       },
       /* #10 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x00C4,0x00D6,0x00DC,0x0000 }, 5 },
-	/*expect*/ { 1,0,1,3,	 ""					  },
+	/*expect*/ { 0,1,3,	 ""					  },
       },
       /* #11 : s is a null pointer. No chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0201,0x0221,0x0000,0x0000 }, 5 },
-	/*expect*/ { 1,EILSEQ,1,(size_t)-1,	 ""			  },
+	/*expect*/ { EILSEQ,1,(size_t)-1,	 ""			  },
       },
       /* #12 : ws is a null wc string, no chars should be stored in s.  */
       { /*input.*/ { 1,1,	       { 0x0000 },			5 },
-	/*expect*/ { 1,0,1,0,	 ""					  },
+	/*expect*/ { 0,1,0,	 ""					  },
       },
       /* #13 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0000 },			5 },
-	/*expect*/ { 1,0,1,0,	 ""					  },
+	/*expect*/ { 0,1,0,	 ""					  },
       },
       { is_last: 1 }
     }
@@ -82,58 +82,58 @@ TST_WCSTOMBS tst_wcstombs_loc [] = {
     {
       /* #01 : Any chars including a null char should not be stored in s.  */
       { /*input.*/ { 1,1,	       { 0x00C4,0x0042,0x0043,0x0000 },	0  },
-	/*expect*/ { 1,0,1,0,	 ""					   },
+	/*expect*/ { 0,1,0,	 ""					   },
       },
       /* #02 : Only one chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,	       { 0x0041,0x0042,0x0043,0x0000 }, 1  },
-	/*expect*/ { 1,0,1,1,	 "A"					   },
+	/*expect*/ { 0,1,1,	 "A"					   },
       },
       /* #03 : Only two chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,	       { 0x0041,0x0042,0x0043,0x0000 }, 2  },
-	/*expect*/ { 1,0,1,2,	 "AB"					   },
+	/*expect*/ { 0,1,2,	 "AB"					   },
       },
       /* #04 : Only three chars should be stored in s. No null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x0041,0x0042,0x0043,0x0000 }, 3  },
-	/*expect*/ { 1,0,1,3,	 "ABC"					   },
+	/*expect*/ { 0,1,3,	 "ABC"					   },
       },
       /* #05 : Only three chars should be stored in s with a null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x0041,0x0042,0x0043,0x0000 }, 4  },
-	/*expect*/ { 1,0,1,3,	 "ABC"					   },
+	/*expect*/ { 0,1,3,	 "ABC"					   },
       },
       /* #06 : Only three chars should be stored in s with a null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x0041,0x0042,0x0043,0x0000 }, 5  },
-	/*expect*/ { 1,0,1,3,	 "ABC"					   },
+	/*expect*/ { 0,1,3,	 "ABC"					   },
       },
       /* #07 : Invalid mb sequence. No chars should be stored in s.  */
       { /*input.*/ { 1,1,	       { 0x0201,0x0221,0x0000,0x0000 }, 2  },
-	/*expect*/ { 1,EILSEQ,1,(size_t)-1,	 ""			   },
+	/*expect*/ { EILSEQ,1,(size_t)-1,	 ""			   },
       },
       /* #08 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0041,0x0042,0x0043,0x0000 }, 0  },
-	/*expect*/ { 1,0,1,3,	 ""					   },
+	/*expect*/ { 0,1,3,	 ""					   },
       },
       /* #09 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0041,0x0042,0x0043,0x0000 }, 1  },
-	/*expect*/ { 1,0,1,3,	 ""					   },
+	/*expect*/ { 0,1,3,	 ""					   },
       },
       /* #10 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0041,0x0042,0x0043,0x0000 }, 5  },
-	/*expect*/ { 1,0,1,3,	 ""					   },
+	/*expect*/ { 0,1,3,	 ""					   },
       },
       /* #11 : s is a null pointer. No chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0201,0x0221,0x0000,0x0000 }, 5  },
-	/*expect*/ { 1,EILSEQ,1,(size_t)-1,	 ""			   },
+	/*expect*/ { EILSEQ,1,(size_t)-1,	 ""			   },
       },
       /* #12 : ws is a null wc string, no chars should be stored in s.  */
       { /*input.*/ { 1,1,	       { 0x0000 },			5, },
-	/*expect*/ { 1,0,1,0,	 ""			                   },
+	/*expect*/ { 0,1,0,	 ""			                   },
       },
       /* #13 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0000 },			5  },
-	/*expect*/ { 1,0,1,0,	 ""					   },
+	/*expect*/ { 0,1,0,	 ""					   },
       },
       { is_last: 1 }
     }
@@ -144,58 +144,58 @@ TST_WCSTOMBS tst_wcstombs_loc [] = {
 
       /* #01 : Any chars including a null char should not be stored in s.  */
       { /*input.*/ { 1,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 0  },
-	/*expect*/ { 1,0,1,0,	 ""					   },
+	/*expect*/ { 0,1,0,	 ""					   },
       },
       /* #02 : Only one chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 2  },
-	/*expect*/ { 1,0,1,2,	     "\244\242"				   },
+	/*expect*/ { 0,1,2,	     "\244\242"				   },
       },
       /* #03 : Only two chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 4  },
-	/*expect*/ { 1,0,1,4,	     "\244\242\244\244"			   },
+	/*expect*/ { 0,1,4,	     "\244\242\244\244"			   },
       },
       /* #04 : Only three chars should be stored in s. No null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 6  },
-	/*expect*/ { 1,0,1,6,	     "\244\242\244\244\216\263"		   },
+	/*expect*/ { 0,1,6,	     "\244\242\244\244\216\263"		   },
       },
       /* #05 : Only three chars should be stored in s with a null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 7  },
-	/*expect*/ { 1,0,1,6,	     "\244\242\244\244\216\263"		   },
+	/*expect*/ { 0,1,6,	     "\244\242\244\244\216\263"		   },
       },
       /* #06 : Only three chars should be stored in s with a null
 	       termination.  */
       { /*input.*/ { 1,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 8  },
-	/*expect*/ { 1,0,1,6,	     "\244\242\244\244\216\263"		   },
+	/*expect*/ { 0,1,6,	     "\244\242\244\244\216\263"		   },
       },
       /* #07 : Invalid mb sequence. No chars should be stored in s.  */
       { /*input.*/ { 1,1,	       { 0x0201,0x0221,0x0000,0x0000 }, 2  },
-	/*expect*/ { 1,EILSEQ,1,-1,	 ""				   },
+	/*expect*/ { EILSEQ,1,-1,	 ""				   },
       },
       /* #08 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 0  },
-	/*expect*/ { 1,0,1,6,	 ""					   },
+	/*expect*/ { 0,1,6,	 ""					   },
       },
       /* #09 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 1  },
-	/*expect*/ { 1,0,1,6,	 ""					   },
+	/*expect*/ { 0,1,6,	 ""					   },
       },
       /* #10 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x3042,0x3044,0xFF73,0x0000 }, 8  },
-	/*expect*/ { 1,0,1,6,	 ""					   },
+	/*expect*/ { 0,1,6,	 ""					   },
       },
       /* #11 : s is a null pointer. No chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0201,0x0221,0x0000,0x0000 }, 5  },
-	/*expect*/ { 1,EILSEQ,1,(size_t)-1,	 ""			   },
+	/*expect*/ { EILSEQ,1,(size_t)-1,	 ""			   },
       },
       /* #12 : ws is a null wc string, no chars should be stored in s.  */
       { /*input.*/ { 1,1,	       { 0x0000 },			5  },
-	/*expect*/ { 1,0,1,0,	 ""					   },
+	/*expect*/ { 0,1,0,	 ""					   },
       },
       /* #13 : s is a null pointer, no chars should be stored in s.  */
       { /*input.*/ { 0,1,	       { 0x0000 },			5  },
-	/*expect*/ { 1,0,1,0,	 ""					   },
+	/*expect*/ { 0,1,0,	 ""					   },
       },
       { is_last: 1 }
     }