aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2014-08-16 13:48:39 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2014-08-16 13:48:39 -0400
commit737cdc2d1412f3e4115137ca6fa14d1b3c39dcbc (patch)
treee1b1dc3eaf5e8b337c4fcbc44a683dca9a5c42f0
parenta068b5b65f83660fc99c3faf39ed50493b010fbb (diff)
downloadpostgresql-737cdc2d1412f3e4115137ca6fa14d1b3c39dcbc.tar.gz
postgresql-737cdc2d1412f3e4115137ca6fa14d1b3c39dcbc.zip
Fix bogus return macros in range_overright_internal().
PG_RETURN_BOOL() should only be used in functions following the V1 SQL function API. This coding accidentally fails to fail since letting the compiler coerce the Datum representation of bool back to plain bool does give the right answer; but that doesn't make it a good idea. Back-patch to older branches just to avoid unnecessary code divergence.
-rw-r--r--src/backend/utils/adt/rangetypes.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
index bc8a480ed3e..c1c3091391f 100644
--- a/src/backend/utils/adt/rangetypes.c
+++ b/src/backend/utils/adt/rangetypes.c
@@ -917,12 +917,12 @@ range_overright_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
/* An empty range is neither before nor after any other range */
if (empty1 || empty2)
- PG_RETURN_BOOL(false);
+ return false;
if (range_cmp_bounds(typcache, &lower1, &lower2) >= 0)
- PG_RETURN_BOOL(true);
+ return true;
- PG_RETURN_BOOL(false);
+ return false;
}
/* does not extend to left of? */