Simplify test in re_string_skip_chars.

diff --git a/ChangeLog b/ChangeLog
index 60f710797ef222a054f104d57294df357dc0ae69..14e3199aee0747c0feadee9ea9c4a2f3af3fa2f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 976dbfc4650631e3e773e5327c221d24bf32cee9..8183a29bf694bacc1c63865a285d178ee2c1e4e9 100644 (file)
--- 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)