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/optimizer/path | |
| 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/optimizer/path')
| -rw-r--r-- | src/backend/optimizer/path/costsize.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/path/indxpath.c | 6 | ||||
| -rw-r--r-- | src/backend/optimizer/path/tidpath.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 5ef29eea69e..4c6b1d1f55b 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -2217,13 +2217,13 @@ cost_append(AppendPath *apath) if (pathkeys == NIL) { - Path *subpath = (Path *) linitial(apath->subpaths); + Path *firstsubpath = (Path *) linitial(apath->subpaths); /* * For an unordered, non-parallel-aware Append we take the startup * cost as the startup cost of the first subpath. */ - apath->path.startup_cost = subpath->startup_cost; + apath->path.startup_cost = firstsubpath->startup_cost; /* Compute rows and costs as sums of subplan rows and costs. */ foreach(l, apath->subpaths) diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 63a8eef45cd..c31fcc917df 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -1303,11 +1303,11 @@ generate_bitmap_or_paths(PlannerInfo *root, RelOptInfo *rel, } else { - RestrictInfo *rinfo = castNode(RestrictInfo, orarg); + RestrictInfo *ri = castNode(RestrictInfo, orarg); List *orargs; - Assert(!restriction_is_or_clause(rinfo)); - orargs = list_make1(rinfo); + Assert(!restriction_is_or_clause(ri)); + orargs = list_make1(ri); indlist = build_paths_for_OR(root, rel, orargs, diff --git a/src/backend/optimizer/path/tidpath.c b/src/backend/optimizer/path/tidpath.c index 279ca1f5b44..c4e035b049b 100644 --- a/src/backend/optimizer/path/tidpath.c +++ b/src/backend/optimizer/path/tidpath.c @@ -305,10 +305,10 @@ TidQualFromRestrictInfoList(PlannerInfo *root, List *rlist, RelOptInfo *rel) } else { - RestrictInfo *rinfo = castNode(RestrictInfo, orarg); + RestrictInfo *ri = castNode(RestrictInfo, orarg); - Assert(!restriction_is_or_clause(rinfo)); - sublist = TidQualFromRestrictInfo(root, rinfo, rel); + Assert(!restriction_is_or_clause(ri)); + sublist = TidQualFromRestrictInfo(root, ri, rel); } /* |