From a762dbd5f60276f9528e9bd78079da7fcc773fde Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 4 Oct 2022 08:15:13 +0200 Subject: [PATCH 2/4] Use llabs() instead of Abs() where appropriate --- contrib/btree_gist/btree_cash.c | 2 +- contrib/btree_gist/btree_int8.c | 2 +- src/backend/utils/adt/datetime.c | 8 ++++---- src/backend/utils/adt/dbsize.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c index 6ac97e2b12a8..d1711137a10d 100644 --- a/contrib/btree_gist/btree_cash.c +++ b/contrib/btree_gist/btree_cash.c @@ -106,7 +106,7 @@ cash_dist(PG_FUNCTION_ARGS) (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), errmsg("money out of range"))); - ra = Abs(r); + ra = llabs(r); PG_RETURN_CASH(ra); } diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c index df2b0d174b96..fb58ab1b8295 100644 --- a/contrib/btree_gist/btree_int8.c +++ b/contrib/btree_gist/btree_int8.c @@ -106,7 +106,7 @@ int8_dist(PG_FUNCTION_ARGS) (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), errmsg("bigint out of range"))); - ra = Abs(r); + ra = llabs(r); PG_RETURN_INT64(ra); } diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 18517fd85cbd..2f6aba62576a 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -4468,7 +4468,7 @@ AddVerboseIntPart(char *cp, int64 value, const char *units, if (*is_zero) { *is_before = (value < 0); - value = Abs(value); + value = llabs(value); } else if (*is_before) value = -value; @@ -4569,8 +4569,8 @@ EncodeInterval(struct pg_itm *itm, int style, char *str) sprintf(cp, "%c%d-%d %c%lld %c%lld:%02d:", year_sign, abs(year), abs(mon), - day_sign, (long long) Abs(mday), - sec_sign, (long long) Abs(hour), abs(min)); + day_sign, llabs(mday), + sec_sign, llabs(hour), abs(min)); cp += strlen(cp); cp = AppendSeconds(cp, sec, fsec, MAX_INTERVAL_PRECISION, true); *cp = '\0'; @@ -4642,7 +4642,7 @@ EncodeInterval(struct pg_itm *itm, int style, char *str) sprintf(cp, "%s%s%02lld:%02d:", is_zero ? "" : " ", (minus ? "-" : (is_before ? "+" : "")), - (long long) Abs(hour), abs(min)); + llabs(hour), abs(min)); cp += strlen(cp); cp = AppendSeconds(cp, sec, fsec, MAX_INTERVAL_PRECISION, true); *cp = '\0'; diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index 34efa121b404..1e1a60e18483 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -564,7 +564,7 @@ pg_size_pretty(PG_FUNCTION_ARGS) uint8 bits; /* use this unit if there are no more units or we're below the limit */ - if (unit[1].name == NULL || Abs(size) < unit->limit) + if (unit[1].name == NULL || llabs(size) < unit->limit) { if (unit->round) size = half_rounded(size); -- 2.37.3