OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify test in re_string_skip_chars.

This commit is contained in:
Ulrich Drepper 2010-01-22 10:22:53 -08:00
parent 4f08104cbf
commit 5ddf954cf1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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]

2
posix/regex_internal.c
View File

@ -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)