From e017830580990842266a5a4f61aca189b56723bb Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 23 May 2001 00:08:46 +0000 Subject: Update. 2001-05-21 Bruno Haible * wcsmbs/mbrtowc.c (mbrtowc): Remove local variable 'flush', always use 0 instead, and rely on the converter to do the flush. * wcsmbs/tst-mbrtowc.c (utf8_test_1): New function, taken from utf8_test. (utf8_test_2, utf8_test_3): New function. (utf8_test): Call utf8_test_1, utf8_test_2, utf8_test_3. --- localedata/tests-mbwc/dat_mbrlen.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'localedata/tests-mbwc/dat_mbrlen.c') diff --git a/localedata/tests-mbwc/dat_mbrlen.c b/localedata/tests-mbwc/dat_mbrlen.c index 4a69833754..3d396c9ea5 100644 --- a/localedata/tests-mbwc/dat_mbrlen.c +++ b/localedata/tests-mbwc/dat_mbrlen.c @@ -99,21 +99,15 @@ TST_MBRLEN tst_mbrlen_loc [] = { { /*----------------- #01 -----------------*/ { { - { 1, "\317\302", 1, 0, 0 }, -#ifdef SHOJI_IS_RIGHT - { 0, "", 0, 0, 0 }, -#else - /* XXX This test depends on the internal state being empty. - XXX Therefore we must explicitly clean it. */ - { 0, "", 0, 0, 1 }, -#endif - { 1, "\317\302", USE_MBCURMAX, 0, 0 }, + { 1, "\317\302", 1, 1, 1 }, + { 0, "", 0, 1, 0 }, + { 1, "\317\302", USE_MBCURMAX, 1, 1 }, } }, { { { 0, 1, -2, }, - { 0, 1, 0, }, + { 0, 1, -1, }, { 0, 1, 2, }, } } -- cgit 1.4.1