diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | include/wctype.h | 4 | ||||
| -rw-r--r-- | posix/regcomp.c | 4 | ||||
| -rw-r--r-- | posix/regex_internal.c | 8 | ||||
| -rw-r--r-- | posix/regex_internal.h | 2 | ||||
| -rw-r--r-- | wctype/wcfuncs.c | 2 |
7 files changed, 28 insertions, 8 deletions
@@ -1,3 +1,17 @@ +2015-06-05 Joseph Myers <joseph@codesourcery.com> + + [BZ #18495] + * wctype/wcfuncs.c (__iswalnum): Use libc_hidden_def. + (__iswlower): Likewise. + * include/wctype.h (__iswalnum): Declare. Use libc_hidden_proto. + (__iswlower): Likewise. + * posix/regcomp.c (re_compile_fastmap_iter): Call __towlower + instead of towlower. + * posix/regex_internal.c (build_wcs_upper_buffer): Call __iswlower + instead of iswlower. Call __towupper instead of towupper. + * posix/regex_internal.h (IS_WIDE_WORD_CHAR): Call __iswalnum + instead of iswalnum. + 2015-06-05 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> * malloc/tst-malloc-backtrace.c (do_test): Redirect libc fatal @@ -20,7 +20,7 @@ Version 2.22 18111, 18116, 18125, 18128, 18138, 18185, 18196, 18197, 18206, 18210, 18211, 18217, 18220, 18221, 18234, 18244, 18247, 18287, 18319, 18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434, 18444, - 18468, 18469, 18470. + 18468, 18469, 18470, 18495. * Cache information can be queried via sysconf() function on s390 e.g. with _SC_LEVEL1_ICACHE_SIZE as argument. diff --git a/include/wctype.h b/include/wctype.h index 88c78e6..a71b103 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -46,11 +46,13 @@ extern wctype_t __wctype (const char *__property); extern wctrans_t __wctrans (const char *__property); extern wint_t __towctrans (wint_t __wc, wctrans_t __desc); +extern __typeof (iswalnum) __iswalnum __THROW __attribute_pure__; extern __typeof (iswalnum_l) __iswalnum_l; extern __typeof (iswalpha_l) __iswalpha_l; extern __typeof (iswblank_l) __iswblank_l; extern __typeof (iswcntrl_l) __iswcntrl_l; extern __typeof (iswdigit_l) __iswdigit_l; +extern __typeof (iswlower) __iswlower __THROW __attribute_pure__; extern __typeof (iswlower_l) __iswlower_l; extern __typeof (iswgraph_l) __iswgraph_l; extern __typeof (iswprint_l) __iswprint_l; @@ -65,11 +67,13 @@ extern __typeof (towupper) __towupper __THROW __attribute_pure__; libc_hidden_proto (__towctrans) libc_hidden_proto (__iswctype) +libc_hidden_proto (__iswalnum) libc_hidden_proto (__iswalnum_l) libc_hidden_proto (__iswalpha_l) libc_hidden_proto (__iswblank_l) libc_hidden_proto (__iswcntrl_l) libc_hidden_proto (__iswdigit_l) +libc_hidden_proto (__iswlower) libc_hidden_proto (__iswlower_l) libc_hidden_proto (__iswgraph_l) libc_hidden_proto (__iswprint_l) diff --git a/posix/regcomp.c b/posix/regcomp.c index 0adde3d..728c482 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -334,7 +334,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, memset (&state, '\0', sizeof (state)); if (__mbrtowc (&wc, (const char *) buf, p - buf, &state) == p - buf - && (__wcrtomb ((char *) buf, towlower (wc), &state) + && (__wcrtomb ((char *) buf, __towlower (wc), &state) != (size_t) -1)) re_set_fastmap (fastmap, 0, buf[0]); } @@ -410,7 +410,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, re_set_fastmap (fastmap, icase, *(unsigned char *) buf); if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1) { - if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) + if (__wcrtomb (buf, __towlower (cset->mbchars[i]), &state) != (size_t) -1) re_set_fastmap (fastmap, false, *(unsigned char *) buf); } diff --git a/posix/regex_internal.c b/posix/regex_internal.c index e5a14cd..d77d3a1 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -312,11 +312,11 @@ build_wcs_upper_buffer (re_string_t *pstr) if (BE (mbclen + 2 > 2, 1)) { wchar_t wcu = wc; - if (iswlower (wc)) + if (__iswlower (wc)) { size_t mbcdlen; - wcu = towupper (wc); + wcu = __towupper (wc); mbcdlen = wcrtomb (buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); @@ -382,11 +382,11 @@ build_wcs_upper_buffer (re_string_t *pstr) if (BE (mbclen + 2 > 2, 1)) { wchar_t wcu = wc; - if (iswlower (wc)) + if (__iswlower (wc)) { size_t mbcdlen; - wcu = towupper (wc); + wcu = __towupper (wc); mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 7fc6d52..154e969 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -471,7 +471,7 @@ typedef struct bin_tree_storage_t bin_tree_storage_t; #define IS_WORD_CHAR(ch) (isalnum (ch) || (ch) == '_') #define IS_NEWLINE(ch) ((ch) == NEWLINE_CHAR) -#define IS_WIDE_WORD_CHAR(ch) (iswalnum (ch) || (ch) == L'_') +#define IS_WIDE_WORD_CHAR(ch) (__iswalnum (ch) || (ch) == L'_') #define IS_WIDE_NEWLINE(ch) ((ch) == WIDE_NEWLINE_CHAR) #define NOT_SATISFY_PREV_CONSTRAINT(constraint,context) \ diff --git a/wctype/wcfuncs.c b/wctype/wcfuncs.c index 788fed9..e7c0308 100644 --- a/wctype/wcfuncs.c +++ b/wctype/wcfuncs.c @@ -38,6 +38,7 @@ #undef iswalnum func (alnum, __ISwalnum) +libc_hidden_def (__iswalnum) libc_hidden_weak (iswalnum) #undef iswalpha func (alpha, __ISwalpha) @@ -51,6 +52,7 @@ func (digit, __ISwdigit) libc_hidden_weak (iswdigit) #undef iswlower func (lower, __ISwlower) +libc_hidden_def (__iswlower) libc_hidden_weak (iswlower) #undef iswgraph func (graph, __ISwgraph) |