diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-02-15 17:11:52 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-02-15 17:11:52 -0500 |
| commit | d2ab9b0ac3e59f6423913669f14a9fe15ab6dc59 (patch) | |
| tree | 811ce75eec94c9a414ff59a4376d414a563fbcc8 /src/backend/regex | |
| parent | 2dcaebea079d6e3c2c78bbf3b0948bf5ef707e21 (diff) | |
| download | postgresql-d2ab9b0ac3e59f6423913669f14a9fe15ab6dc59.tar.gz postgresql-d2ab9b0ac3e59f6423913669f14a9fe15ab6dc59.zip | |
Suppress compiler warnings about useless comparison of unsigned to zero.
Reportedly, some compilers warn about tests like "c < 0" if c is unsigned,
and hence complain about the character range checks I added in commit
3bb3f42f3749d40b8d4de65871e8d828b18d4a45. This is a bit of a pain since
the regex library doesn't really want to assume that chr is unsigned.
However, since any such reconfiguration would involve manual edits of
regcustom.h anyway, we can put it on the shoulders of whoever wants to
do that to adjust this new range-checking macro correctly.
Per gripes from Coverity and Andres.
Diffstat (limited to 'src/backend/regex')
| -rw-r--r-- | src/backend/regex/regc_lex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/regex/regc_lex.c b/src/backend/regex/regc_lex.c index 00da05571af..d68f88c7fc0 100644 --- a/src/backend/regex/regc_lex.c +++ b/src/backend/regex/regc_lex.c @@ -792,13 +792,13 @@ lexescape(struct vars * v) break; case CHR('u'): c = lexdigits(v, 16, 4, 4); - if (ISERR() || c < CHR_MIN || c > CHR_MAX) + if (ISERR() || !CHR_IS_IN_RANGE(c)) FAILW(REG_EESCAPE); RETV(PLAIN, c); break; case CHR('U'): c = lexdigits(v, 16, 8, 8); - if (ISERR() || c < CHR_MIN || c > CHR_MAX) + if (ISERR() || !CHR_IS_IN_RANGE(c)) FAILW(REG_EESCAPE); RETV(PLAIN, c); break; @@ -816,7 +816,7 @@ lexescape(struct vars * v) case CHR('x'): NOTE(REG_UUNPORT); c = lexdigits(v, 16, 1, 255); /* REs >255 long outside spec */ - if (ISERR() || c < CHR_MIN || c > CHR_MAX) + if (ISERR() || !CHR_IS_IN_RANGE(c)) FAILW(REG_EESCAPE); RETV(PLAIN, c); break; |