diff options
| author | DJ Delorie <dj@delorie.com> | 2005-04-13 01:06:55 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2005-04-13 01:06:55 +0000 |
| commit | 17f2439caa4c0f0c2b530ae8530c67e159e30544 (patch) | |
| tree | dd363b612d83dfddad0eaee43988c8502efd731f /libiberty | |
| parent | 02651b69f9848007fbb2d4a927955eec5a65d894 (diff) | |
| download | gdb-17f2439caa4c0f0c2b530ae8530c67e159e30544.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/regex.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index d5e97f32585..bdede48bbc9 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,5 +1,10 @@ 2005-04-12 Gabriel Dos Reis <gdr@integrable-solutions.net> + * regex.c (wcs_re_match_2_internal, byte_re_match_2_internal): + Replace not with negate. + +2005-04-12 Gabriel Dos Reis <gdr@integrable-solutions.net> + * configure.ac: Check declarations for basename, ffs, asprintf, vasprintf. * configure: Regenerate. diff --git a/libiberty/regex.c b/libiberty/regex.c index 601bbf14b36..66f1ef8c6db 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -6174,7 +6174,7 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp, #endif /* WCHAR */ boolean negate = (re_opcode_t) *(p - 1) == charset_not; - DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : ""); + DEBUG_PRINT2 ("EXECUTING charset%s.\n", negate ? "_not" : ""); PREFETCH (); c = TRANSLATE (*d); /* The character to match. */ #ifdef WCHAR @@ -6544,7 +6544,7 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp, negate = !negate; char_set_matched: - if (not) goto fail; + if (negate) goto fail; #else /* Cast to `unsigned' instead of `unsigned char' in case the bit list is a full 32 bytes long. */ |