From 2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7 Mon Sep 17 00:00:00 2001 From: David Rowley Date: Wed, 5 Oct 2022 21:01:41 +1300 Subject: Rename shadowed local variables In a similar effort to f01592f91, here we mostly rename shadowed local variables to remove the warnings produced when compiling with -Wshadow=compatible-local. This fixes 63 warnings and leaves just 5. Author: Justin Pryzby, David Rowley Reviewed-by: Justin Pryzby Discussion https://postgr.es/m/20220817145434.GC26426%40telsasoft.com --- src/backend/utils/adt/partitionfuncs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/utils/adt/partitionfuncs.c') diff --git a/src/backend/utils/adt/partitionfuncs.c b/src/backend/utils/adt/partitionfuncs.c index 109dc8023e1..96b5ae52d27 100644 --- a/src/backend/utils/adt/partitionfuncs.c +++ b/src/backend/utils/adt/partitionfuncs.c @@ -238,9 +238,9 @@ pg_partition_ancestors(PG_FUNCTION_ARGS) if (funcctx->call_cntr < list_length(ancestors)) { - Oid relid = list_nth_oid(ancestors, funcctx->call_cntr); + Oid resultrel = list_nth_oid(ancestors, funcctx->call_cntr); - SRF_RETURN_NEXT(funcctx, ObjectIdGetDatum(relid)); + SRF_RETURN_NEXT(funcctx, ObjectIdGetDatum(resultrel)); } SRF_RETURN_DONE(funcctx); -- cgit v1.2.3