aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2014-08-16 13:48:46 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2014-08-16 13:48:46 -0400
commitf2d4f45c0ec7073dba75ffec8402b6d61de3bcfc (patch)
tree0c19f591ea1cad1fb3092174425da46bb06fefbc
parentbdd62aabb4c3695dbb57155905b8bed7de56fd46 (diff)
downloadpostgresql-f2d4f45c0ec7073dba75ffec8402b6d61de3bcfc.tar.gz
postgresql-f2d4f45c0ec7073dba75ffec8402b6d61de3bcfc.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 3da08bb8370..96e686e6d69 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? */