diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/regcomp.c | 4 | ||||
| -rw-r--r-- | posix/regex_internal.c | 8 | ||||
| -rw-r--r-- | posix/regex_internal.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/posix/regcomp.c b/posix/regcomp.c index 0adde3d4a8..728c48239f 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 e5a14cde20..d77d3a14dc 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 7fc6d524e9..154e96999d 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) \ |