diff options
Diffstat (limited to 'winsup/cygwin/regex')
| -rw-r--r-- | winsup/cygwin/regex/regcomp.c | 3 | ||||
| -rw-r--r-- | winsup/cygwin/regex/regexec.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c index c5e68a2b5..3556dddd8 100644 --- a/winsup/cygwin/regex/regcomp.c +++ b/winsup/cygwin/regex/regcomp.c @@ -1152,7 +1152,8 @@ wgetnext(struct parse *p) else if (sizeof (wchar_t) == 2 && wc >= 0xd800 && wc <= 0xdbff) { /* UTF-16 surrogate pair. Fetch second half and compute UTF-32 value */ - int n2 = mbrtowc(&wc, p->next + n, p->end - p->next - n, &mbs); + size_t n2 = mbrtowc(&wc, p->next + n, + p->end - p->next - n, &mbs); if (n2 == 0 || n2 == (size_t)-1 || n2 == (size_t)-2) { SETERROR(REG_ILLSEQ); return (0); diff --git a/winsup/cygwin/regex/regexec.c b/winsup/cygwin/regex/regexec.c index 788ef5eeb..ad12ada41 100644 --- a/winsup/cygwin/regex/regexec.c +++ b/winsup/cygwin/regex/regexec.c @@ -88,7 +88,7 @@ xmbrtowc(wint_t *wi, const char *s, size_t n, mbstate_t *mbs, wint_t dummy) if (sizeof (wchar_t) == 2 && wc >= 0xd800 && wc <= 0xdbff) { /* UTF-16 surrogate pair. Fetch second half and compute UTF-32 value */ - int n2 = mbrtowc(&wc, s + nr, n - nr, mbs); + size_t n2 = mbrtowc(&wc, s + nr, n - nr, mbs); if (n2 == 0 || n2 == (size_t)-1 || n2 == (size_t)-2) { memset(mbs, 0, sizeof(*mbs)); if (wi != NULL) |