diff options
| author |   Ulrich Drepper <drepper@redhat.com> | 2010-01-22 10:22:53 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-22 10:22:53 -0800 |
| commit | 5ddf954cf19d43f54ba44f487427d210952e1236 (patch) | |
| tree | a63514c3c5df0dacad8088f712153de51b70d89d | |
| parent | regex_internal.c: don't assume WEOF fits in wchar_t (diff) | |
| download | glibc-5ddf954cf19d43f54ba44f487427d210952e1236.tar.gz glibc-5ddf954cf19d43f54ba44f487427d210952e1236.tar.bz2 glibc-5ddf954cf19d43f54ba44f487427d210952e1236.zip | |
Simplify test in re_string_skip_chars.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | posix/regex_internal.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2010-01-22 Ulrich Drepper <drepper@redhat.com> + + * posix/regex_internal.c (re_string_skip_chars): Simplify test for + failed mbrtowc call. + 2010-01-22 Jim Meyering <jim@meyering.net> [BZ #11186] diff --git a/posix/regex_internal.c b/posix/regex_internal.c index 976dbfc465..8183a29bf6 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -500,7 +500,7 @@ re_string_skip_chars (re_string_t *pstr, int new_raw_idx, wint_t *last_wc) prev_st = pstr->cur_state; mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx, remain_len, &pstr->cur_state); - if (BE (mbclen == (size_t) -2 || mbclen == (size_t) -1 || mbclen == 0, 0)) + if (BE ((ssize_t) mbclen <= 0, 0)) { /* We treat these cases as a single byte character. */ if (mbclen == 0 || remain_len == 0) |