Revision: 1125
http://vcs.pcre.org/viewvc?view=rev&revision=1125
Author: chpe
Date: 2012-10-18 19:34:57 +0100 (Thu, 18 Oct 2012)
Log Message:
-----------
Add extra parentheses around && inside ||
Fixes warnings from -Wparentheses.
Modified Paths:
--------------
code/trunk/pcre16_valid_utf16.c
code/trunk/pcre32_valid_utf32.c
code/trunk/pcretest.c
Modified: code/trunk/pcre16_valid_utf16.c
===================================================================
--- code/trunk/pcre16_valid_utf16.c 2012-10-18 18:34:53 UTC (rev 1124)
+++ code/trunk/pcre16_valid_utf16.c 2012-10-18 18:34:57 UTC (rev 1125)
@@ -102,7 +102,7 @@
/* Normal UTF-16 code point. Neither high nor low surrogate. */
/* Check for non-characters */
- if ((c & 0xfffeu) == 0xfffeu || c >= 0xfdd0u && c <= 0xfdefu)
+ if ((c & 0xfffeu) == 0xfffeu || (c >= 0xfdd0u && c <= 0xfdefu))
{
*erroroffset = p - string;
return PCRE_UTF16_ERR4;
Modified: code/trunk/pcre32_valid_utf32.c
===================================================================
--- code/trunk/pcre32_valid_utf32.c 2012-10-18 18:34:53 UTC (rev 1124)
+++ code/trunk/pcre32_valid_utf32.c 2012-10-18 18:34:57 UTC (rev 1125)
@@ -100,8 +100,7 @@
/* Normal UTF-32 code point. Neither high nor low surrogate. */
/* Check for non-characters */
- if ((c & 0xfffeu) == 0xfffeu ||
- c >= 0xfdd0u && c <= 0xfdefu)
+ if ((c & 0xfffeu) == 0xfffeu || (c >= 0xfdd0u && c <= 0xfdefu))
{
*erroroffset = p - string;
return PCRE_UTF32_ERR2;
Modified: code/trunk/pcretest.c
===================================================================
--- code/trunk/pcretest.c 2012-10-18 18:34:53 UTC (rev 1124)
+++ code/trunk/pcretest.c 2012-10-18 18:34:57 UTC (rev 1125)
@@ -2096,8 +2096,7 @@
return FALSE;
/* Non-character */
- if ((c & 0xfffeu) == 0xfffeu ||
- c >= 0xfdd0u && c <= 0xfdefu)
+ if ((c & 0xfffeu) == 0xfffeu || (c >= 0xfdd0u && c <= 0xfdefu))
return FALSE;
}
