From 660a31762a9122c240227f1f542ac4e284b5e4c5 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Wed, 17 Aug 2022 00:22:45 -0500 Subject: [PATCH 08/17] avoid shadow vars: res backpatch to v15 commit 1a36bc9dba8eae90963a586d37b6457b32b2fed4 Author: Andrew Dunstan Date: Thu Mar 3 13:11:14 2022 -0500 SQL/JSON query functions --- src/backend/utils/adt/jsonpath_exec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 10c7e64aab3..d1e3385975a 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -3109,10 +3109,10 @@ JsonItemFromDatum(Datum val, Oid typid, int32 typmod, JsonbValue *res) if (JsonContainerIsScalar(&jb->root)) { - bool res PG_USED_FOR_ASSERTS_ONLY; + bool tmp PG_USED_FOR_ASSERTS_ONLY; - res = JsonbExtractScalar(&jb->root, jbv); - Assert(res); + tmp = JsonbExtractScalar(&jb->root, jbv); + Assert(tmp); } else JsonbInitBinary(jbv, jb); -- 2.17.1