diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-02-12 23:17:22 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-02-12 23:17:22 +0300 |
| commit | 6b3f923fe237348c594e8271141f6a12c5fb327d (patch) | |
| tree | 15a378391949ccd255fc3422eba35e7fef18a026 | |
| parent | 492f1c34314adfa6be20b27ed4b4eba8fd6c5390 (diff) | |
* regex/regcomp.c (wgetnext): Use size_t as type for n2 since that's
what's returned by mbrtowc.
* regex/regexec.c (xmbrtowc): Ditto.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/regex/regcomp.c | 3 | ||||
| -rw-r--r-- | winsup/cygwin/regex/regexec.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 02abda230..e2486cf69 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2010-02-12 Corinna Vinschen <corinna@vinschen.de> + + * regex/regcomp.c (wgetnext): Use size_t as type for n2 since that's + what's returned by mbrtowc. + * regex/regexec.c (xmbrtowc): Ditto. + 2010-02-12 Christopher Faylor <me+cygwin@cgf.cx> * pthread.cc (pthread_mutex_init): Explicitly fill out third arg to 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) |