From 6ab48edd947a23e524b732923efe733dc1ffbeb3 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 13 Apr 2005 01:06:55 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 5 +++++ libiberty/regex.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index d5e97f325..bdede48bb 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,5 +1,10 @@ 2005-04-12 Gabriel Dos Reis + * regex.c (wcs_re_match_2_internal, byte_re_match_2_internal): + Replace not with negate. + +2005-04-12 Gabriel Dos Reis + * configure.ac: Check declarations for basename, ffs, asprintf, vasprintf. * configure: Regenerate. diff --git a/libiberty/regex.c b/libiberty/regex.c index 601bbf14b..66f1ef8c6 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. */ -- 2.11.4.GIT