From 29f8f546767ebb4253f6dc37815e2d95fff9acd0 Mon Sep 17 00:00:00 2001 From: Alexander Korotkov Date: Mon, 21 Dec 2020 14:25:32 +0300 Subject: [PATCH] Fix compiler warning in multirange_constructor0() Discussion: https://postgr.es/m/X%2BBP8XE0UpIB6Yvh%40paquier.xyz Author: Michael Paquier --- src/backend/utils/adt/multirangetypes.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c index a4dc439a21..06316ba6b6 100644 --- a/src/backend/utils/adt/multirangetypes.c +++ b/src/backend/utils/adt/multirangetypes.c @@ -1016,20 +1016,20 @@ multirange_constructor1(PG_FUNCTION_ARGS) Datum multirange_constructor0(PG_FUNCTION_ARGS) { - Oid mltrngtypid = get_fn_expr_rettype(fcinfo->flinfo); + Oid mltrngtypid; TypeCacheEntry *typcache; TypeCacheEntry *rangetyp; + /* This should always be called without arguments */ + if (PG_NARGS() != 0) + elog(ERROR, + "niladic multirange constructor must not receive arguments"); + + mltrngtypid = get_fn_expr_rettype(fcinfo->flinfo); typcache = multirange_get_typcache(fcinfo, mltrngtypid); rangetyp = typcache->rngtype; - /* We should always be called with no arguments */ - - if (PG_NARGS() == 0) - PG_RETURN_MULTIRANGE_P(make_multirange(mltrngtypid, rangetyp, 0, NULL)); - else - elog(ERROR, /* can't happen */ - "niladic multirange constructor must not receive arguments"); + PG_RETURN_MULTIRANGE_P(make_multirange(mltrngtypid, rangetyp, 0, NULL)); } -- 2.39.5