diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
commit | a65dd355fb80a05215e15ae97649de52aec885e3 (patch) | |
tree | 81701bb0c6b648630f2bf1729a85d7f5eb49e67b /localedata/tests-mbwc/tst_mbrtowc.c | |
parent | 296a5732f94abe4d5699dc981e4ccfb950b48cee (diff) | |
parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'localedata/tests-mbwc/tst_mbrtowc.c')
-rw-r--r-- | localedata/tests-mbwc/tst_mbrtowc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/localedata/tests-mbwc/tst_mbrtowc.c b/localedata/tests-mbwc/tst_mbrtowc.c index 3a6070a870..ffb33ce11e 100644 --- a/localedata/tests-mbwc/tst_mbrtowc.c +++ b/localedata/tests-mbwc/tst_mbrtowc.c @@ -16,7 +16,7 @@ tst_mbrtowc (FILE * fp, int debug_flg) char w_flg, s_flg; char *s; size_t n; - char t_flg, t_ini; + char t_flg; static mbstate_t t = { 0 }; mbstate_t *pt; wchar_t wc, *pwc, wc_ex; @@ -42,7 +42,6 @@ tst_mbrtowc (FILE * fp, int debug_flg) s = TST_INPUT_SEQ (mbrtowc).s; n = TST_INPUT_SEQ (mbrtowc).n; t_flg = TST_INPUT_SEQ (mbrtowc).t_flg; - t_ini = TST_INPUT_SEQ (mbrtowc).t_init; pwc = (w_flg == 0) ? NULL : &wc; if (s_flg == 0) @@ -56,12 +55,7 @@ tst_mbrtowc (FILE * fp, int debug_flg) } pt = (t_flg == 0) ? NULL : &t; -#if 0 - if (t_ini != 0) - { - memset (&t, 0, sizeof (t)); - } -#endif + TST_CLEAR_ERRNO; ret = mbrtowc (pwc, s, n, pt); TST_SAVE_ERRNO; |