diff options
| author | David Rowley <drowley@postgresql.org> | 2022-10-05 21:01:41 +1300 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2022-10-05 21:01:41 +1300 |
| commit | 2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7 (patch) | |
| tree | 5ded2ec68835504c3f10fcec732b80b7a2bc3f08 /src/backend/executor | |
| parent | 839c2520a7937b8895ff84fc8fc718dbfab5e72e (diff) | |
| download | postgresql-2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7.tar.gz postgresql-2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7.zip | |
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
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 11 | ||||
| -rw-r--r-- | src/backend/executor/spi.c | 26 |
2 files changed, 17 insertions, 20 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index fe74e498145..373bcf61889 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -3483,8 +3483,6 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) */ if (aggnode->aggstrategy == AGG_SORTED) { - int i = 0; - Assert(aggnode->numCols > 0); /* @@ -3495,9 +3493,9 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) (ExprState **) palloc0(aggnode->numCols * sizeof(ExprState *)); /* for each grouping set */ - for (i = 0; i < phasedata->numsets; i++) + for (int k = 0; k < phasedata->numsets; k++) { - int length = phasedata->gset_lengths[i]; + int length = phasedata->gset_lengths[k]; if (phasedata->eqfunctions[length - 1] != NULL) continue; @@ -3576,7 +3574,6 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) { Plan *outerplan = outerPlan(node); uint64 totalGroups = 0; - int i; aggstate->hash_metacxt = AllocSetContextCreate(aggstate->ss.ps.state->es_query_cxt, "HashAgg meta context", @@ -3599,8 +3596,8 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) * when there is more than one grouping set, but should still be * reasonable. */ - for (i = 0; i < aggstate->num_hashes; i++) - totalGroups += aggstate->perhash[i].aggnode->numGroups; + for (int k = 0; k < aggstate->num_hashes; k++) + totalGroups += aggstate->perhash[k].aggnode->numGroups; hash_agg_set_limits(aggstate->hashentrysize, totalGroups, 0, &aggstate->hash_mem_limit, diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index 29bc26669b0..fd5796f1b9e 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -2484,35 +2484,35 @@ _SPI_execute_plan(SPIPlanPtr plan, const SPIExecuteOptions *options, { RawStmt *parsetree = plansource->raw_parse_tree; const char *src = plansource->query_string; - List *stmt_list; + List *querytree_list; /* * Parameter datatypes are driven by parserSetup hook if provided, * otherwise we use the fixed parameter list. */ if (parsetree == NULL) - stmt_list = NIL; + querytree_list = NIL; else if (plan->parserSetup != NULL) { Assert(plan->nargs == 0); - stmt_list = pg_analyze_and_rewrite_withcb(parsetree, - src, - plan->parserSetup, - plan->parserSetupArg, - _SPI_current->queryEnv); + querytree_list = pg_analyze_and_rewrite_withcb(parsetree, + src, + plan->parserSetup, + plan->parserSetupArg, + _SPI_current->queryEnv); } else { - stmt_list = pg_analyze_and_rewrite_fixedparams(parsetree, - src, - plan->argtypes, - plan->nargs, - _SPI_current->queryEnv); + querytree_list = pg_analyze_and_rewrite_fixedparams(parsetree, + src, + plan->argtypes, + plan->nargs, + _SPI_current->queryEnv); } /* Finish filling in the CachedPlanSource */ CompleteCachedPlan(plansource, - stmt_list, + querytree_list, NULL, plan->argtypes, plan->nargs, |