diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | posix/regex_internal.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 98c36d5012..01257e6753 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-01-22 Jim Meyering <jim@meyering.net> + [BZ #11185] + * posix/regex_internal.c (re_string_reconstruct): Remove declaration + and stores into set-but-not-used local, "q". + [BZ #11184] * posix/regex_internal.c (re_dfa_add_node): Extend the overflow detection test. Patch by Paul Eggert. diff --git a/posix/regex_internal.c b/posix/regex_internal.c index 67c174a824..95f2a0e405 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -701,7 +701,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) if (pstr->is_utf8) { - const unsigned char *raw, *p, *q, *end; + const unsigned char *raw, *p, *end; /* Special case UTF-8. Multi-byte chars start with any byte other than 0x80 - 0xbf. */ @@ -730,13 +730,11 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) unsigned char buf[6]; size_t mbclen; - q = p; if (BE (pstr->trans != NULL, 0)) { int i = mlen < 6 ? mlen : 6; while (--i >= 0) buf[i] = pstr->trans[p[i]]; - q = buf; } /* XXX Don't use mbrtowc, we know which conversion to use (UTF-8 -> UCS4). */ |