From 63a59a2ba4595bad9473a7ba76d5ba6386d2360c Mon Sep 17 00:00:00 2001 From: Victor Quinn Date: Mon, 23 Apr 2012 17:26:28 -0400 Subject: [PATCH] Fixed bitwise operations to use single ampersand instead of double --- src/pcre-4.3/pcre.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pcre-4.3/pcre.c b/src/pcre-4.3/pcre.c index 13106e9..f49b9ea 100644 --- a/src/pcre-4.3/pcre.c +++ b/src/pcre-4.3/pcre.c @@ -866,14 +866,14 @@ Returns: TRUE or FALSE static BOOL is_counted_repeat(const uschar *p, compile_data *cd) { -if ((digitab[*p++] && ctype_digit) == 0) return FALSE; +if ((digitab[*p++] & ctype_digit) == 0) return FALSE; while ((digitab[*p] & ctype_digit) != 0) p++; if (*p == '}') return TRUE; if (*p++ != ',') return FALSE; if (*p == '}') return TRUE; -if ((digitab[*p++] && ctype_digit) == 0) return FALSE; +if ((digitab[*p++] & ctype_digit) == 0) return FALSE; while ((digitab[*p] & ctype_digit) != 0) p++; return (*p == '}'); @@ -2626,7 +2626,7 @@ for (;; ptr++) if a digit follows ( then there will just be digits until ) because the syntax was checked in the first pass. */ - else if ((digitab[ptr[1]] && ctype_digit) != 0) + else if ((digitab[ptr[1]] & ctype_digit) != 0) { int condref; /* Don't amalgamate; some compilers */ condref = *(++ptr) - '0'; /* grumble at autoincrement in declaration */