AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-09 19:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

regex_internal.c: remove useless variable and the code to set it.

Browse Source
This commit is contained in:
Ulrich Drepper 2010-01-22 09:57:30 -08:00
parent 2236464488
commit 0dae5d4ec1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-01-22 Jim Meyering <jim@meyering.net> 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] [BZ #11184]
* posix/regex_internal.c (re_dfa_add_node): Extend the overflow * posix/regex_internal.c (re_dfa_add_node): Extend the overflow
detection test. Patch by Paul Eggert. detection test. Patch by Paul Eggert.

4
posix/regex_internal.c
View File

@ -701,7 +701,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
if (pstr->is_utf8) 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 /* Special case UTF-8. Multi-byte chars start with any
byte other than 0x80 - 0xbf. */ byte other than 0x80 - 0xbf. */
@ -730,13 +730,11 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
unsigned char buf[6]; unsigned char buf[6];
size_t mbclen; size_t mbclen;
q = p;
if (BE (pstr->trans != NULL, 0)) if (BE (pstr->trans != NULL, 0))
{ {
int i = mlen < 6 ? mlen : 6; int i = mlen < 6 ? mlen : 6;
while (--i >= 0) while (--i >= 0)
buf[i] = pstr->trans[p[i]]; buf[i] = pstr->trans[p[i]];
q = buf;
} }
/* XXX Don't use mbrtowc, we know which conversion /* XXX Don't use mbrtowc, we know which conversion
to use (UTF-8 -> UCS4). */ to use (UTF-8 -> UCS4). */