Blame SOURCES/glibc-rh1505492-unused-4.patch
|
 |
c6d234 |
commit d540fc8a66507bbbdc7e6594872786527c7667fa
|
|
|
c6d234 |
Author: Ondřej Bílka <neleai@seznam.cz>
|
|
|
c6d234 |
Date: Mon Nov 18 13:12:29 2013 +0100
|
|
|
c6d234 |
|
|
|
c6d234 |
Remove unused variable.
|
|
|
c6d234 |
|
|
|
c6d234 |
diff --git a/localedata/tests-mbwc/tst_mbrtowc.c b/localedata/tests-mbwc/tst_mbrtowc.c
|
|
|
c6d234 |
index 3a6070a870550552..ffb33ce11e1d72b7 100644
|
|
|
c6d234 |
--- a/localedata/tests-mbwc/tst_mbrtowc.c
|
|
|
c6d234 |
+++ b/localedata/tests-mbwc/tst_mbrtowc.c
|
|
|
c6d234 |
@@ -16,7 +16,7 @@ tst_mbrtowc (FILE * fp, int debug_flg)
|
|
|
c6d234 |
char w_flg, s_flg;
|
|
|
c6d234 |
char *s;
|
|
|
c6d234 |
size_t n;
|
|
|
c6d234 |
- char t_flg, t_ini;
|
|
|
c6d234 |
+ char t_flg;
|
|
|
c6d234 |
static mbstate_t t = { 0 };
|
|
|
c6d234 |
mbstate_t *pt;
|
|
|
c6d234 |
wchar_t wc, *pwc, wc_ex;
|
|
|
c6d234 |
@@ -42,7 +42,6 @@ tst_mbrtowc (FILE * fp, int debug_flg)
|
|
|
c6d234 |
s = TST_INPUT_SEQ (mbrtowc).s;
|
|
|
c6d234 |
n = TST_INPUT_SEQ (mbrtowc).n;
|
|
|
c6d234 |
t_flg = TST_INPUT_SEQ (mbrtowc).t_flg;
|
|
|
c6d234 |
- t_ini = TST_INPUT_SEQ (mbrtowc).t_init;
|
|
|
c6d234 |
pwc = (w_flg == 0) ? NULL : &wc;
|
|
|
c6d234 |
|
|
|
c6d234 |
if (s_flg == 0)
|
|
|
c6d234 |
@@ -56,12 +55,7 @@ tst_mbrtowc (FILE * fp, int debug_flg)
|
|
|
c6d234 |
}
|
|
|
c6d234 |
|
|
|
c6d234 |
pt = (t_flg == 0) ? NULL : &t;
|
|
|
c6d234 |
-#if 0
|
|
|
c6d234 |
- if (t_ini != 0)
|
|
|
c6d234 |
- {
|
|
|
c6d234 |
- memset (&t, 0, sizeof (t));
|
|
|
c6d234 |
- }
|
|
|
c6d234 |
-#endif
|
|
|
c6d234 |
+
|
|
|
c6d234 |
TST_CLEAR_ERRNO;
|
|
|
c6d234 |
ret = mbrtowc (pwc, s, n, pt);
|
|
|
c6d234 |
TST_SAVE_ERRNO;
|