about summary refs log tree commit diff
path: root/localedata/tests-mbwc/dat_strfmon.c
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-08-18 09:34:18 +0000
committerAndreas Jaeger <aj@suse.de>2000-08-18 09:34:18 +0000
commitec7956d922c85fc6154062ce5ba58fe40e9d5901 (patch)
tree3a990101ac791acb2841899d63594eb3d34e43e3 /localedata/tests-mbwc/dat_strfmon.c
parenta0c9a28b7cc5d8b85d4e65109729ad9a7a9ebe00 (diff)
downloadglibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar.gz
glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar.xz
glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.zip
* 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.
Diffstat (limited to 'localedata/tests-mbwc/dat_strfmon.c')
-rw-r--r--localedata/tests-mbwc/dat_strfmon.c90
1 files changed, 45 insertions, 45 deletions
diff --git a/localedata/tests-mbwc/dat_strfmon.c b/localedata/tests-mbwc/dat_strfmon.c
index 1252ecfe4e..1e2035375a 100644
--- a/localedata/tests-mbwc/dat_strfmon.c
+++ b/localedata/tests-mbwc/dat_strfmon.c
@@ -21,77 +21,77 @@ TST_STRFMON tst_strfmon_loc [] = {
       {
 	/* #01 */
 	/*inp*/ { 23, "%n %% %i",	     123.00			},
-	/*exp*/ { 1,0,1,22,		     "123,00 DM % 123,00 DEM"	},
+	/*exp*/ { 0,1,22,		     "123,00 DM % 123,00 DEM"	},
       },
       {
 	/* #02 */
 	/*inp*/ { 23, "%n %% %i",	     123.00			},
-	/*exp*/ { 1,0,1,22,		     "123,00 DM % 123,00 DEM"	},
+	/*exp*/ { 0,1,22,		     "123,00 DM % 123,00 DEM"	},
       },
       {
 	/* #03 */
 	/*inp*/ { 22, "%n %% %i",	     123.00			},
-	/*exp*/ { 1,E2BIG,1,-1,	     ""					},
+	/*exp*/ { E2BIG,1,-1,	     ""					},
       },
       {
 	/* #04 */
 	/*inp*/ { 30, "%n|%i",	     1234.561				},
-	/*exp*/ { 1,0,1,24,		     "1.234,56 DM|1.234,56 DEM"	},
+	/*exp*/ { 0,1,24,		     "1.234,56 DM|1.234,56 DEM"	},
       },
       {
 	/* #05 */
 	/*inp*/ { 32, "%n|%i",	    -1234.561				},
-	/*exp*/ { 1,0,1,26,		     "-1.234,56 DM|-1.234,56 DEM"},
+	/*exp*/ { 0,1,26,		     "-1.234,56 DM|-1.234,56 DEM"},
       },
       {
 	/* #06 */
 	/*inp*/ { 32, "%12n|%12i",	     1234.561			},
-	/*exp*/ { 1,0,1,25,		     " 1.234,56 DM|1.234,56 DEM"},
+	/*exp*/ { 0,1,25,		     " 1.234,56 DM|1.234,56 DEM"},
       },
       {
 	/* #07 */
 	/*inp*/ { 32, "%12n|%12i",	    -1234.561			},
-	/*exp*/ { 1,0,1,26,		     "-1.234,56 DM|-1.234,56 DEM"},
+	/*exp*/ { 0,1,26,		     "-1.234,56 DM|-1.234,56 DEM"},
       },
       {
 	/* #08 */
 	/*inp*/ { 32, "%#5n|%#5i",	     1234.561			},
-	/*exp*/ { 1,0,1,28,		     "  1.234,56 DM|  1.234,56 DEM"},
+	/*exp*/ { 0,1,28,		     "  1.234,56 DM|  1.234,56 DEM"},
       },
       {
 	/* #09 */
 	/*inp*/ { 32, "%#5n|%#5i",	    -1234.561			},
-	/*exp*/ { 1,0,1,28,		     "- 1.234,56 DM|- 1.234,56 DEM"},
+	/*exp*/ { 0,1,28,		     "- 1.234,56 DM|- 1.234,56 DEM"},
       },
       {
 	/* #10 */
 	/*inp*/ { 32, "%=*#5n|%=*#5i",	 1234.561			},
-	/*exp*/ { 1,0,1,28,		     " *1.234,56 DM| *1.234,56 DEM"},
+	/*exp*/ { 0,1,28,		     " *1.234,56 DM| *1.234,56 DEM"},
       },
       {
 	/* #11 */
 	/*inp*/ { 32, "%=0#5n|%=0#5i",	-1234.561			},
-	/*exp*/ { 1,0,1,28,		     "-01.234,56 DM|-01.234,56 DEM"},
+	/*exp*/ { 0,1,28,		     "-01.234,56 DM|-01.234,56 DEM"},
       },
       {
 	/* #12 */
 	/*inp*/ { 32, "%^#5n|%^#5i",	-1234.561			},
-	/*exp*/ { 1,0,1,26,		     "- 1234,56 DM|- 1234,56 DEM"},
+	/*exp*/ { 0,1,26,		     "- 1234,56 DM|- 1234,56 DEM"},
       },
       {
 	/* #13 */
 	/*inp*/ { 32, "%#5.0n|%#5.0i",	 1234.444			},
-	/*exp*/ { 1,0,1,22,		     "  1.234 DM|  1.234 DEM"	},
+	/*exp*/ { 0,1,22,		     "  1.234 DM|  1.234 DEM"	},
       },
       {
 	/* #14 */
 	/*inp*/ { 32, "%#5.0n|%#5.4i",	-1234.555			},
-	/*exp*/ { 1,0,1,27,		     "- 1.235 DM|- 1.234,5550 DEM"},
+	/*exp*/ { 0,1,27,		     "- 1.235 DM|- 1.234,5550 DEM"},
       },
       {
 	/* #15 */
 	/*inp*/ { 32, "%(#5n|%!(#5i",	-1234.561			},
-	/*exp*/ { 1,0,1,26,		     "( 1.234,56 DM)|( 1.234,56)"},
+	/*exp*/ { 0,1,26,		     "( 1.234,56 DM)|( 1.234,56)"},
       },
       { is_last: 1 }
     }
@@ -102,77 +102,77 @@ TST_STRFMON tst_strfmon_loc [] = {
       {
 	/* #01 */
 	/*inp*/ { 22, "%n %% %i",	     123.00			},
-	/*exp*/ { 1,0,1,20,		     "$123.00 % USD 123.00"	},
+	/*exp*/ { 0,1,20,		     "$123.00 % USD 123.00"	},
       },
       {
 	/* #02 */
 	/*inp*/ { 21, "%n %% %i",	     123.00			},
-	/*exp*/ { 1,0,1,20,		     "$123.00 % USD 123.00"	},
+	/*exp*/ { 0,1,20,		     "$123.00 % USD 123.00"	},
       },
       {
 	/* #03 */
 	/*inp*/ { 20, "%n %% %i",	     123.00			},
-	/*exp*/ { 1,E2BIG,1,-1,	     ""					},
+	/*exp*/ { E2BIG,1,-1,	     ""					},
       },
       {
 	/* #04 */
 	/*inp*/ { 30, "%n|%i",	     1234.561				},
-	/*exp*/ { 1,0,1,22,		     "$1,234.56|USD 1,234.56"	},
+	/*exp*/ { 0,1,22,		     "$1,234.56|USD 1,234.56"	},
       },
       {
 	/* #05 */
 	/*inp*/ { 32, "%n|%i",	    -1234.561				},
-	/*exp*/ { 1,0,1,24,		     "-$1,234.56|-USD 1,234.56"	},
+	/*exp*/ { 0,1,24,		     "-$1,234.56|-USD 1,234.56"	},
       },
       {
 	/* #06 */
 	/*inp*/ { 30, "%12n|%12i",	     1234.561			},
-	/*exp*/ { 1,0,1,25,		     "   $1,234.56|USD 1,234.56"},
+	/*exp*/ { 0,1,25,		     "   $1,234.56|USD 1,234.56"},
       },
       {
 	/* #07 */
 	/*inp*/ { 32, "%12n|%12i",	    -1234.561			},
-	/*exp*/ { 1,0,1,26,		     "  -$1,234.56|-USD 1,234.56"},
+	/*exp*/ { 0,1,26,		     "  -$1,234.56|-USD 1,234.56"},
       },
       {
 	/* #08 */
 	/*inp*/ { 32, "%#5n|%#5i",	     1234.561			},
-	/*exp*/ { 1,0,1,26,		     " $ 1,234.56| USD  1,234.56"},
+	/*exp*/ { 0,1,26,		     " $ 1,234.56| USD  1,234.56"},
       },
       {
 	/* #09 */
 	/*inp*/ { 32, "%#5n|%#5i",	    -1234.561			},
-	/*exp*/ { 1,0,1,26,		     "-$ 1,234.56|-USD  1,234.56"},
+	/*exp*/ { 0,1,26,		     "-$ 1,234.56|-USD  1,234.56"},
       },
       {
 	/* #10 */
 	/*inp*/ { 32, "%=*#5n|%=*#5i",	 1234.561			},
-	/*exp*/ { 1,0,1,26,		     " $*1,234.56| USD *1,234.56"},
+	/*exp*/ { 0,1,26,		     " $*1,234.56| USD *1,234.56"},
       },
       {
 	/* #11 */
 	/*inp*/ { 32, "%=0#5n|%=0#5i",	-1234.561			},
-	/*exp*/ { 1,0,1,26,		     "-$01,234.56|-USD 01,234.56"},
+	/*exp*/ { 0,1,26,		     "-$01,234.56|-USD 01,234.56"},
       },
       {
 	/* #12 */
 	/*inp*/ { 32, "%^#5n|%^#5i",	-1234.561			},
-	/*exp*/ { 1,0,1,24,		     "-$ 1234.56|-USD  1234.56"	},
+	/*exp*/ { 0,1,24,		     "-$ 1234.56|-USD  1234.56"	},
       },
       {
 	/* #13 */
 	/*inp*/ { 32, "%#5.0n|%#5.0i",	 1234.444			},
-	/*exp*/ { 1,0,1,20,		     " $ 1,234| USD  1,234"	},
+	/*exp*/ { 0,1,20,		     " $ 1,234| USD  1,234"	},
       },
       {
 	/* #14 */
 	/*inp*/ { 32, "%#5.0n|%#5.4i",	-1234.555			},
-	/*exp*/ { 1,0,1,25,		     "-$ 1,235|-USD  1,234.5550"},
+	/*exp*/ { 0,1,25,		     "-$ 1,235|-USD  1,234.5550"},
       },
       {
 	/* #15 */
 	/*inp*/ { 32, "%(#5n|%!(#5i",	-1234.561			},
-	/*exp*/ { 1,0,1,24,		     "($ 1,234.56)|( 1,234.56)"	},
+	/*exp*/ { 0,1,24,		     "($ 1,234.56)|( 1,234.56)"	},
       },
       { is_last: 1 }
     }
@@ -183,77 +183,77 @@ TST_STRFMON tst_strfmon_loc [] = {
       {
 	/* #01 */
 	/*inp*/ { 17, "%n %% %i",	 123.00				   },
-	/*exp*/ { 1,0,1,15,		 "\241\357123 % JPY 123"	   },
+	/*exp*/ { 0,1,15,		 "\241\357123 % JPY 123"	   },
       },
       {
 	/* #02 */
 	/*inp*/ { 16, "%n %% %i",	 123.00				   },
-	/*exp*/ { 1,0,1,15,		 "\241\357123 % JPY 123"	   },
+	/*exp*/ { 0,1,15,		 "\241\357123 % JPY 123"	   },
       },
       {
 	/* #03 */
 	/*inp*/ { 15, "%n %% %i",	 123.00				   },
-	/*exp*/ { 1,E2BIG,1,-1,		 ""				   },
+	/*exp*/ { E2BIG,1,-1,		 ""				   },
       },
       {
 	/* #04 */
 	/*inp*/ { 30, "%n|%i",		 1234.561			   },
-	/*exp*/ { 1,0,1,17,		 "\241\3571,235|JPY 1,235"	   },
+	/*exp*/ { 0,1,17,		 "\241\3571,235|JPY 1,235"	   },
       },
       {
 	/* #05 */
 	/*inp*/ { 32, "%n|%i",		-1234.561			   },
-	/*exp*/ { 1,0,1,19,		 "\241\357-1,235|JPY -1,235"	   },
+	/*exp*/ { 0,1,19,		 "\241\357-1,235|JPY -1,235"	   },
       },
       {
 	/* #06 */
 	/*inp*/ { 32, "%12n|%12i",	 1234.561			   },
-	/*exp*/ { 1,0,1,25,		 "     \241\3571,235|   JPY 1,235" },
+	/*exp*/ { 0,1,25,		 "     \241\3571,235|   JPY 1,235" },
       },
       {
 	/* #07 */
 	/*inp*/ { 32, "%12n|%12i",	-1234.561			   },
-	/*exp*/ { 1,0,1,25,		 "    \241\357-1,235|  JPY -1,235" },
+	/*exp*/ { 0,1,25,		 "    \241\357-1,235|  JPY -1,235" },
       },
       {
 	/* #08 */
 	/*inp*/ { 32, "%#5n|%#5i",	 1234.561			   },
-	/*exp*/ { 1,0,1,21,		 " \241\357 1,235| JPY  1,235"	   },
+	/*exp*/ { 0,1,21,		 " \241\357 1,235| JPY  1,235"	   },
       },
       {
 	/* #09 */
 	/*inp*/ { 32, "%#5n|%#5i",	-1234.561			   },
-	/*exp*/ { 1,0,1,21,		 "\241\357- 1,235|JPY - 1,235"	   },
+	/*exp*/ { 0,1,21,		 "\241\357- 1,235|JPY - 1,235"	   },
       },
       {
 	/* #10 */
 	/*inp*/ { 32, "%=*#5n|%=*#5i",	 1234.561			   },
-	/*exp*/ { 1,0,1,21,		 " \241\357*1,235| JPY *1,235"	   },
+	/*exp*/ { 0,1,21,		 " \241\357*1,235| JPY *1,235"	   },
       },
       {
 	/* #11 */
 	/*inp*/ { 32, "%=0#5n|%=0#5i",	-1234.561			   },
-	/*exp*/ { 1,0,1,21,		 "\241\357-01,235|JPY -01,235"	   },
+	/*exp*/ { 0,1,21,		 "\241\357-01,235|JPY -01,235"	   },
       },
       {
 	/* #12 */
 	/*inp*/ { 32, "%^#5n|%^#5i",	-1234.561			   },
-	/*exp*/ { 1,0,1,19,		 "\241\357- 1235|JPY - 1235"	   },
+	/*exp*/ { 0,1,19,		 "\241\357- 1235|JPY - 1235"	   },
       },
       {
 	/* #13 */
 	/*inp*/ { 32, "%#5.0n|%#5.0i",	 1234.444			   },
-	/*exp*/ { 1,0,1,21,		 " \241\357 1,234| JPY  1,234"	   },
+	/*exp*/ { 0,1,21,		 " \241\357 1,234| JPY  1,234"	   },
       },
       {
 	/* #14 */
 	/*inp*/ { 32, "%#5.0n|%#5.4i",	-1234.555			   },
-	/*exp*/ { 1,0,1,26,		 "\241\357- 1,235|JPY - 1,234.5550"},
+	/*exp*/ { 0,1,26,		 "\241\357- 1,235|JPY - 1,234.5550"},
       },
       {
 	/* #15 */
 	/*inp*/ { 32, "%(#5n|%!(#5i",	-1234.561			   },
-	/*exp*/ { 1,0,1,19,		 "(\241\357 1,235)|( 1,235)"	   },
+	/*exp*/ { 0,1,19,		 "(\241\357 1,235)|( 1,235)"	   },
       },
       { is_last: 1 }
     }