From e3319a0d6820c9344f01f01bdd9cd630e70b908a Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Wed, 16 Nov 2022 12:30:54 +0100
Subject: [PATCH v25 9/9] Stylistic changes

---
 src/backend/optimizer/util/inherit.c |  7 ++++---
 src/backend/optimizer/util/relnode.c |  4 ++--
 src/backend/parser/analyze.c         |  3 +--
 src/backend/parser/parse_relation.c  | 11 ++++++-----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.c
index 468d37726a..a7b5606286 100644
--- a/src/backend/optimizer/util/inherit.c
+++ b/src/backend/optimizer/util/inherit.c
@@ -133,8 +133,9 @@ expand_inherited_rtentry(PlannerInfo *root, RelOptInfo *rel,
 	/* Scan the inheritance set and expand it */
 	if (oldrelation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
 	{
-		RTEPermissionInfo *root_perminfo =
-			GetRTEPermissionInfo(root->parse->rtepermlist, rte);
+		RTEPermissionInfo *perminfo;
+
+		perminfo = GetRTEPermissionInfo(root->parse->rtepermlist, rte);
 
 		/*
 		 * Partitioned table, so set up for partitioning.
@@ -147,7 +148,7 @@ expand_inherited_rtentry(PlannerInfo *root, RelOptInfo *rel,
 		 */
 		expand_partitioned_rtentry(root, rel, rte, rti,
 								   oldrelation,
-								   root_perminfo->updatedCols,
+								   perminfo->updatedCols,
 								   oldrc, lockmode);
 	}
 	else
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 4691f7f344..a1dedf52d5 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -233,9 +233,9 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
 		 */
 		if (parent == NULL)
 		{
-			RTEPermissionInfo *perminfo =
-				GetRTEPermissionInfo(root->parse->rtepermlist, rte);
+			RTEPermissionInfo *perminfo;
 
+			perminfo = GetRTEPermissionInfo(root->parse->rtepermlist, rte);
 			rel->userid = perminfo->checkAsUser;
 		}
 		else
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 25324d9486..5279866f43 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -3348,8 +3348,7 @@ transformLockingClause(ParseState *pstate, Query *qry, LockingClause *lc,
 												   lc->strength,
 												   lc->waitPolicy,
 												   pushedDown);
-								perminfo =
-									GetRTEPermissionInfo(qry->rtepermlist, rte);
+								perminfo = GetRTEPermissionInfo(qry->rtepermlist, rte);
 								perminfo->requiredPerms |= ACL_SELECT_FOR_UPDATE;
 							}
 							break;
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 92ead7d8be..177558a158 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -1021,14 +1021,15 @@ markRTEForSelectPriv(ParseState *pstate, int rtindex, AttrNumber col)
 
 	if (rte->rtekind == RTE_RELATION)
 	{
-		RTEPermissionInfo *perminfo =
-			GetRTEPermissionInfo(pstate->p_rtepermlist, rte);
+		RTEPermissionInfo *perminfo;
 
 		/* Make sure the rel as a whole is marked for SELECT access */
+		perminfo = GetRTEPermissionInfo(pstate->p_rtepermlist, rte);
 		perminfo->requiredPerms |= ACL_SELECT;
 		/* Must offset the attnum to fit in a bitmapset */
-		perminfo->selectedCols = bms_add_member(perminfo->selectedCols,
-										   col - FirstLowInvalidHeapAttributeNumber);
+		perminfo->selectedCols =
+			bms_add_member(perminfo->selectedCols,
+						   col - FirstLowInvalidHeapAttributeNumber);
 	}
 	else if (rte->rtekind == RTE_JOIN)
 	{
@@ -3731,7 +3732,7 @@ AddRTEPermissionInfo(List **rtepermlist, RangeTblEntry *rte)
 
 	*rtepermlist = lappend(*rtepermlist, perminfo);
 
-	/* Note its index.  */
+	/* Note its index (1-based!) */
 	rte->perminfoindex = list_length(*rtepermlist);
 
 	return perminfo;
-- 
2.30.2