Renaming cleanup, no pgindent yet.

11 files changed, 120 insertions, 120 deletions

diff --git a/src/backend/optimizer/util/clauseinfo.c b/src/backend/optimizer/util/clauseinfo.c
index 7b7fdfc407..0385edaae9 100644
--- a/src/backend/optimizer/util/clauseinfo.c
+++ b/src/backend/optimizer/util/clauseinfo.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.7 1998/02/26 04:33:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.8 1998/09/01 03:23:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,15 +27,15 @@
  *
  */
 bool
-valid_or_clause(CInfo *clauseinfo)
+valid_or_clause(ClauseInfo *clauseinfo)
 {
 	if (clauseinfo != NULL &&
 		!single_node((Node *) clauseinfo->clause) &&
 		!clauseinfo->notclause &&
 		or_clause((Node *) clauseinfo->clause))
-		return (true);
+		return true;
 	else
-		return (false);
+		return false;
 }
 
 /*
@@ -49,14 +49,14 @@ get_actual_clauses(List *clauseinfo_list)
 {
 	List	   *temp = NIL;
 	List	   *result = NIL;
-	CInfo	   *clause = (CInfo *) NULL;
+	ClauseInfo	   *clause = (ClauseInfo *) NULL;
 
 	foreach(temp, clauseinfo_list)
 	{
-		clause = (CInfo *) lfirst(temp);
+		clause = (ClauseInfo *) lfirst(temp);
 		result = lappend(result, clause->clause);
 	}
-	return (result);
+	return result;
 }
 
 /*
@@ -93,7 +93,7 @@ get_relattvals(List *clauseinfo_list,
 	List	   *result1 = NIL;
 	List	   *result2 = NIL;
 	List	   *result3 = NIL;
-	CInfo	   *temp = (CInfo *) NULL;
+	ClauseInfo	   *temp = (ClauseInfo *) NULL;
 	List	   *i = NIL;
 
 	foreach(i, clauseinfo_list)
@@ -103,7 +103,7 @@ get_relattvals(List *clauseinfo_list,
 		Datum		constval;
 		int			flag;
 
-		temp = (CInfo *) lfirst(i);
+		temp = (ClauseInfo *) lfirst(i);
 		get_relattval((Node *) temp->clause, &dummy, &attno, &constval, &flag);
 		result1 = lappendi(result1, (int) attno);
 		result2 = lappendi(result2, constval);
@@ -144,7 +144,7 @@ get_joinvars(Oid relid,
 
 	foreach(temp, clauseinfo_list)
 	{
-		CInfo	   *clauseinfo = lfirst(temp);
+		ClauseInfo	   *clauseinfo = lfirst(temp);
 		Expr	   *clause = clauseinfo->clause;
 
 		if (IsA(get_leftop(clause), Var) &&
@@ -176,16 +176,16 @@ get_joinvars(Oid relid,
 List *
 get_opnos(List *clauseinfo_list)
 {
-	CInfo	   *temp = (CInfo *) NULL;
+	ClauseInfo	   *temp = (ClauseInfo *) NULL;
 	List	   *result = NIL;
 	List	   *i = NIL;
 
 	foreach(i, clauseinfo_list)
 	{
-		temp = (CInfo *) lfirst(i);
+		temp = (ClauseInfo *) lfirst(i);
 		result =
 			lappendi(result,
 					 (((Oper *) temp->clause->oper)->opno));
 	}
-	return (result);
+	return result;
 }
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 89906454eb..0ec0f74ca1 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.22 1998/08/31 07:55:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.23 1998/09/01 03:23:49 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -60,7 +60,7 @@ make_clause(int type, Node *oper, List *args)
 	{
 		elog(ERROR, "make_clause: unsupported type %d", type);
 		/* will this ever happen? translated from lispy C code - ay 10/94 */
-		return ((Expr *) args);
+		return (Expr *) args;
 	}
 }
 
@@ -117,7 +117,7 @@ Var *
 get_leftop(Expr *clause)
 {
 	if (clause->args != NULL)
-		return (lfirst(clause->args));
+		return lfirst(clause->args);
 	else
 		return NULL;
 }
@@ -132,7 +132,7 @@ Var *
 get_rightop(Expr *clause)
 {
 	if (clause->args != NULL && lnext(clause->args) != NULL)
-		return (lfirst(lnext(clause->args)));
+		return lfirst(lnext(clause->args));
 	else
 		return NULL;
 }
@@ -266,7 +266,7 @@ make_notclause(Expr *notclause)
 Expr *
 get_notclausearg(Expr *notclause)
 {
-	return (lfirst(notclause->args));
+	return lfirst(notclause->args);
 }
 
 /*****************************************************************************
@@ -405,7 +405,7 @@ NumRelids(Node *clause)
 			var_list = lconsi(var->varno, var_list);
 	}
 
-	return (length(var_list));
+	return length(var_list);
 }
 
 /*
@@ -419,10 +419,10 @@ bool
 contains_not(Node *clause)
 {
 	if (single_node(clause))
-		return (false);
+		return false;
 
 	if (not_clause(clause))
-		return (true);
+		return true;
 
 	if (or_clause(clause) || and_clause(clause))
 	{
@@ -431,11 +431,11 @@ contains_not(Node *clause)
 		foreach(a, ((Expr *) clause)->args)
 		{
 			if (contains_not(lfirst(a)))
-				return (true);
+				return true;
 		}
 	}
 
-	return (false);
+	return false;
 }
 
 /*
@@ -467,9 +467,9 @@ is_joinable(Node *clause)
 	 * ... or a func node.
 	 */
 	if (is_funcclause(leftop) || is_funcclause(rightop))
-		return (true);
+		return true;
 
-	return (false);
+	return false;
 }
 
 /*
@@ -487,11 +487,11 @@ qual_clause_p(Node *clause)
 	/* How about Param-s ?	- vadim 02/03/98 */
 	if (IsA(get_leftop((Expr *) clause), Var) &&
 		IsA(get_rightop((Expr *) clause), Const))
-		return (true);
+		return true;
 	else if (IsA(get_rightop((Expr *) clause), Var) &&
 			 IsA(get_leftop((Expr *) clause), Const))
-		return (true);
-	return (false);
+		return true;
+	return false;
 }
 
 /*
@@ -558,7 +558,7 @@ fix_opids(List *clauses)
 	foreach(clause, clauses)
 		fix_opid(lfirst(clause));
 
-	return (clauses);
+	return clauses;
 }
 
 /*
@@ -759,7 +759,7 @@ CommuteClause(Node *clause)
 {
 	Node	   *temp;
 	Oper	   *commu;
-	OperatorTupleForm commuTup;
+	Form_pg_operator commuTup;
 	HeapTuple	heapTup;
 
 	if (!is_opclause(clause))
@@ -771,7 +771,7 @@ CommuteClause(Node *clause)
 	if (heapTup == (HeapTuple) NULL)
 		return;
 
-	commuTup = (OperatorTupleForm) GETSTRUCT(heapTup);
+	commuTup = (Form_pg_operator) GETSTRUCT(heapTup);
 
 	commu = makeOper(heapTup->t_oid,
 					 InvalidOid,
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 43f870cb1f..a48c817e1f 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.8 1998/07/18 04:22:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.9 1998/09/01 03:23:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,9 +36,9 @@ List *
 find_relation_indices(Query *root, RelOptInfo *rel)
 {
 	if (rel->indexed)
-		return (find_secondary_index(root, lfirsti(rel->relids)));
+		return find_secondary_index(root, lfirsti(rel->relids));
 	else
-		return (NIL);
+		return NIL;
 }
 
 /*
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index fb3ac0ba30..9e45905bc8 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.10 1998/08/10 02:26:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.11 1998/09/01 03:23:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@
  * exists.
  *
  */
-JInfo *
+JoinInfo *
 joininfo_member(List *join_relids, List *joininfo_list)
 {
 	List	   *i = NIL;
@@ -44,10 +44,10 @@ joininfo_member(List *join_relids, List *joininfo_list)
 	foreach(i, joininfo_list)
 	{
 		other_rels = lfirst(i);
-		if (same(join_relids, ((JInfo *) other_rels)->otherrels))
-			return ((JInfo *) other_rels);
+		if (same(join_relids, ((JoinInfo *) other_rels)->otherrels))
+			return (JoinInfo *) other_rels;
 	}
-	return ((JInfo *) NULL);
+	return (JoinInfo *) NULL;
 }
 
 
@@ -61,15 +61,15 @@ joininfo_member(List *join_relids, List *joininfo_list)
  * Returns a joininfo node.
  *
  */
-JInfo *
+JoinInfo *
 find_joininfo_node(RelOptInfo *this_rel, List *join_relids)
 {
-	JInfo	   *joininfo = joininfo_member(join_relids,
+	JoinInfo	   *joininfo = joininfo_member(join_relids,
 										   this_rel->joininfo);
 
 	if (joininfo == NULL)
 	{
-		joininfo = makeNode(JInfo);
+		joininfo = makeNode(JoinInfo);
 		joininfo->otherrels = join_relids;
 		joininfo->jinfoclauseinfo = NIL;
 		joininfo->mergejoinable = false;
@@ -77,7 +77,7 @@ find_joininfo_node(RelOptInfo *this_rel, List *join_relids)
 		joininfo->inactive = false;
 		this_rel->joininfo = lcons(joininfo, this_rel->joininfo);
 	}
-	return (joininfo);
+	return joininfo;
 }
 
 /*
@@ -108,5 +108,5 @@ other_join_clause_var(Var *var, Expr *clause)
 			retval = l;
 	}
 
-	return (retval);
+	return retval;
 }
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index 60bbf08dd1..9ecf7377ab 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.7 1998/07/18 04:22:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.8 1998/09/01 03:23:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -59,9 +59,9 @@ match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel)
 	if (IsA(operand, Var) &&
 		(lfirsti(rel->relids) == operand->varno) &&
 		equal_indexkey_var(indexkey, operand))
-		return (true);
+		return true;
 	else
-		return (false);
+		return false;
 }
 
 /*
@@ -74,9 +74,9 @@ static bool
 equal_indexkey_var(int index_key, Var *var)
 {
 	if (index_key == var->varattno)
-		return (true);
+		return true;
 	else
-		return (false);
+		return false;
 }
 
 /*
@@ -102,7 +102,7 @@ extract_subkey(JoinKey *jk, int which_subkey)
 			elog(DEBUG, "extract_subkey with neither INNER or OUTER");
 			retval = NULL;
 	}
-	return (retval);
+	return retval;
 }
 
 /*
@@ -130,9 +130,9 @@ samekeys(List *keys1, List *keys2)
 			allmember = false;
 
 	if ((length(keys2) >= length(keys1)) && allmember)
-		return (true);
+		return true;
 	else
-		return (false);
+		return false;
 }
 
 /*
@@ -172,9 +172,9 @@ matching2_tlvar(int var, List *tlist, bool (*test) ())
 	}
 
 	if (tlentry)
-		return ((Expr *) get_expr(tlentry));
+		return (Expr *) get_expr(tlentry);
 	else
-		return ((Expr *) NULL);
+		return (Expr *) NULL;
 }
 
 
@@ -197,5 +197,5 @@ collect_index_pathkeys(int *index_keys, List *tlist)
 										 NIL));
 		index_keys++;
 	}
-	return (retval);
+	return retval;
 }
diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c
index 855f2f7274..1157a3c709 100644
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.6 1997/09/08 21:45:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.7 1998/09/01 03:23:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,13 +81,13 @@ equal_path_merge_ordering(Oid *path_ordering,
 						  MergeOrder *merge_ordering)
 {
 	if (path_ordering == NULL || merge_ordering == NULL)
-		return (false);
+		return false;
 
 	if (path_ordering[0] == merge_ordering->left_operator ||
 		path_ordering[0] == merge_ordering->right_operator)
-		return (true);
+		return true;
 	else
-		return (false);
+		return false;
 }
 
 /*
@@ -99,7 +99,7 @@ bool
 equal_merge_merge_ordering(MergeOrder *merge_ordering1,
 						   MergeOrder *merge_ordering2)
 {
-	return (equal(merge_ordering1, merge_ordering2));
+	return equal(merge_ordering1, merge_ordering2);
 }
 
 /*****************************************************************************
@@ -116,7 +116,7 @@ equal_sortops_order(Oid *ordering1, Oid *ordering2)
 	int			i = 0;
 
 	if (ordering1 == NULL || ordering2 == NULL)
-		return (ordering1 == ordering2);
+		return ordering1 == ordering2;
 
 	while (ordering1[i] != 0 && ordering2[i] != 0)
 	{
@@ -125,5 +125,5 @@ equal_sortops_order(Oid *ordering1, Oid *ordering2)
 		i++;
 	}
 
-	return (ordering1[i] == 0 && ordering2[i] == 0);
+	return ordering1[i] == 0 && ordering2[i] == 0;
 }
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 6b62ac79d6..bdd4e4509a 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.10 1998/08/04 16:44:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.11 1998/09/01 03:23:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,7 @@ path_is_cheaper(Path *path1, Path *path2)
 	Cost		cost1 = path1->path_cost;
 	Cost		cost2 = path2->path_cost;
 
-	return ((bool) (cost1 < cost2));
+	return (bool) (cost1 < cost2);
 }
 
 /*
@@ -82,7 +82,7 @@ set_cheapest(RelOptInfo *parent_rel, List *pathlist)
 
 	parent_rel->cheapestpath = cheapest_so_far;
 
-	return (cheapest_so_far);
+	return cheapest_so_far;
 }
 
 /*
@@ -133,7 +133,7 @@ add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths)
 									 LispRemove(old_path, unique_paths));
 		}
 	}
-	return (unique_paths);
+	return unique_paths;
 }
 
 /*
@@ -184,7 +184,7 @@ better_path(Path *new_path, List *unique_paths, bool *noOther)
 			retval = old_path;
 	}
 
-	return (retval);
+	return retval;
 }
 
 
@@ -233,7 +233,7 @@ create_seqscan_path(RelOptInfo *rel)
 			xfunc_get_path_cost(pathnode);
 	}
 #endif
-	return (pathnode);
+	return pathnode;
 }
 
 /*
@@ -388,7 +388,7 @@ create_index_path(Query *root,
 		/* XXX Can this divide the selectivities in a better way? */
 		set_clause_selectivities(restriction_clauses, clausesel);
 	}
-	return (pathnode);
+	return pathnode;
 }
 
 /*
@@ -458,7 +458,7 @@ create_nestloop_path(RelOptInfo *joinrel,
 	if (XfuncMode != XFUNC_OFF)
 		pathnode->path_cost += xfunc_get_path_cost((Path *) pathnode);
 #endif
-	return (pathnode);
+	return pathnode;
 }
 
 /*
@@ -525,7 +525,7 @@ create_mergejoin_path(RelOptInfo *joinrel,
 			xfunc_get_path_cost((Path *) pathnode);
 	}
 #endif
-	return (pathnode);
+	return pathnode;
 }
 
 /*
@@ -592,5 +592,5 @@ create_hashjoin_path(RelOptInfo *joinrel,
 			xfunc_get_path_cost((Path *) pathnode);
 	}
 #endif
-	return (pathnode);
+	return pathnode;
 }
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e46205523c..b04efb5a36 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.19 1998/08/19 02:02:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.20 1998/09/01 03:23:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,8 +42,8 @@
 
 static void
 IndexSelectivity(Oid indexrelid, Oid indrelid, int32 nIndexKeys,
-			  Oid AccessMethodOperatorClasses[], Oid operatorObjectIds[],
-	int32 varAttributeNumbers[], char *constValues[], int32 constFlags[],
+			  Oid *AccessMethodOperatorClasses, Oid *operatorObjectIds,
+	int32 *varAttributeNumbers, char **constValues, int32 *constFlags,
 				 float *idxPages, float *idxSelec);
 
 
@@ -106,7 +106,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
 	int			i;
 	HeapTuple	indexTuple,
 				amopTuple;
-	IndexTupleForm index;
+	Form_pg_index index;
 	Relation	indexRelation;
 	uint16		amstrategy;
 	Oid			relam;
@@ -160,11 +160,11 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
 		heap_close(relation);
 		scan = (HeapScanDesc) NULL;
 		relation = (Relation) NULL;
-		return (0);
+		return 0;
 	}
 
 	/* Extract info from the index tuple */
-	index = (IndexTupleForm) GETSTRUCT(indexTuple);
+	index = (Form_pg_index) GETSTRUCT(indexTuple);
 	info->relid = index->indexrelid;	/* index relation */
 	for (i = 0; i < 8; i++)
 		info->indexkeys[i] = index->indkey[i];
@@ -223,7 +223,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
 		info->orderOprs[i] =
 			((Form_pg_amop) GETSTRUCT(amopTuple))->amopopr;
 	}
-	return (TRUE);
+	return TRUE;
 }
 
 /*
@@ -347,7 +347,7 @@ restriction_selectivity(Oid functionObjectId,
 		elog(ERROR, "RestrictionClauseSelectivity: bad value %lf",
 			 *result);
 
-	return ((Cost) *result);
+	return (Cost) *result;
 }
 
 /*
@@ -386,7 +386,7 @@ join_selectivity(Oid functionObjectId,
 		elog(ERROR, "JoinClauseSelectivity: bad value %lf",
 			 *result);
 
-	return ((Cost) *result);
+	return (Cost) *result;
 }
 
 /*
@@ -416,12 +416,12 @@ find_inheritance_children(Oid inhparent)
 	scan = heap_beginscan(relation, 0, SnapshotNow, 1, key);
 	while (HeapTupleIsValid(inheritsTuple = heap_getnext(scan, 0)))
 	{
-		inhrelid = ((InheritsTupleForm) GETSTRUCT(inheritsTuple))->inhrel;
+		inhrelid = ((Form_pg_inherits) GETSTRUCT(inheritsTuple))->inhrel;
 		list = lappendi(list, inhrelid);
 	}
 	heap_endscan(scan);
 	heap_close(relation);
-	return (list);
+	return list;
 }
 
 /*
@@ -450,7 +450,7 @@ VersionGetParents(Oid verrelid)
 	scan = heap_beginscan(relation, 0, SnapshotNow, 1, key);
 	while (HeapTupleIsValid(versionTuple = heap_getnext(scan, 0)))
 	{
-		verbaseid = ((VersionTupleForm)
+		verbaseid = ((Form_pg_version)
 					 GETSTRUCT(versionTuple))->verbaseid;
 
 		list = lconsi(verbaseid, list);
@@ -460,7 +460,7 @@ VersionGetParents(Oid verrelid)
 	}
 	heap_endscan(scan);
 	heap_close(relation);
-	return (list);
+	return list;
 }
 
 /*****************************************************************************
@@ -492,11 +492,11 @@ static void
 IndexSelectivity(Oid indexrelid,
 				 Oid indrelid,
 				 int32 nIndexKeys,
-				 Oid AccessMethodOperatorClasses[],		/* XXX not used? */
-				 Oid operatorObjectIds[],
-				 int32 varAttributeNumbers[],
-				 char *constValues[],
-				 int32 constFlags[],
+				 Oid *AccessMethodOperatorClasses,		/* XXX not used? */
+				 Oid *operatorObjectIds,
+				 int32 *varAttributeNumbers,
+				 char **constValues,
+				 int32 *constFlags,
 				 float *idxPages,
 				 float *idxSelec)
 {
@@ -505,7 +505,7 @@ IndexSelectivity(Oid indexrelid,
 	HeapTuple	indexTuple,
 				amopTuple,
 				indRel;
-	IndexTupleForm index;
+	Form_pg_index index;
 	Form_pg_amop amop;
 	Oid			indclass;
 	float64data npages,
@@ -530,7 +530,7 @@ IndexSelectivity(Oid indexrelid,
 	if (!HeapTupleIsValid(indexTuple))
 		elog(ERROR, "IndexSelectivity: index %d not found",
 			 indexrelid);
-	index = (IndexTupleForm) GETSTRUCT(indexTuple);
+	index = (Form_pg_index) GETSTRUCT(indexTuple);
 
 	/*
 	 * Hack for non-functional btree npages estimation: npages =
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 756ca8570e..869b4ff6bd 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.7 1998/08/10 02:26:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.8 1998/09/01 03:23:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -124,8 +124,8 @@ rel_member(List *relid, List *rels)
 		{
 			temprelid = ((RelOptInfo *) lfirst(temp))->relids;
 			if (same(temprelid, relid))
-				return ((RelOptInfo *) (lfirst(temp)));
+				return (RelOptInfo *) (lfirst(temp));
 		}
 	}
-	return (NULL);
+	return NULL;
 }
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index d7a74f3184..8aee7a1645 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.16 1998/07/20 21:18:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.17 1998/09/01 03:23:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,10 +54,10 @@ tlistentry_member(Var *var, List *targetlist)
 		{
 			if (var_equal(var,
 						  get_expr(lfirst(temp))))
-				return ((TargetEntry *) lfirst(temp));
+				return (TargetEntry *) lfirst(temp);
 		}
 	}
-	return (NULL);
+	return NULL;
 }
 
 /*
@@ -75,9 +75,9 @@ matching_tlvar(Var *var, List *targetlist)
 
 	tlentry = tlistentry_member(var, targetlist);
 	if (tlentry)
-		return ((Expr *) get_expr(tlentry));
+		return (Expr *) get_expr(tlentry);
 
-	return ((Expr *) NULL);
+	return (Expr *) NULL;
 }
 
 /*
@@ -163,7 +163,7 @@ get_actual_tlist(List *tlist)
 	if (tlist == NULL)
 	{
 		elog(DEBUG, "calling get_actual_tlist with empty tlist");
-		return (NIL);
+		return NIL;
 	}
 
 	/*
@@ -175,7 +175,7 @@ get_actual_tlist(List *tlist)
 	foreach(element, tlist)
 		result = lappend(result, lfirst((List *) lfirst(element)));
 
-	return (result);
+	return result;
 #endif
 	return tlist;
 }
@@ -216,11 +216,11 @@ tlist_member(Var *var, List *tlist)
 		}
 
 		if (tl_elt != NULL)
-			return (tl_elt->resdom);
+			return tl_elt->resdom;
 		else
-			return ((Resdom *) NULL);
+			return (Resdom *) NULL;
 	}
-	return ((Resdom *) NULL);
+	return (Resdom *) NULL;
 }
 
 /*
@@ -239,9 +239,9 @@ tlist_resdom(List *tlist, Resdom *resnode)
 		resdom = temp_tle->resdom;
 		/* Since resnos are supposed to be unique */
 		if (resnode->resno == resdom->resno)
-			return (resdom);
+			return resdom;
 	}
-	return ((Resdom *) NULL);
+	return (Resdom *) NULL;
 }
 
 
@@ -291,11 +291,11 @@ match_varid(Var *test_var, List *tlist)
 		{
 
 			if (tlvar->vartype == type_var)
-				return (entry);
+				return entry;
 		}
 	}
 
-	return (NULL);
+	return NULL;
 }
 
 
@@ -322,7 +322,7 @@ new_unsorted_tlist(List *targetlist)
 		tle->resdom->reskey = 0;
 		tle->resdom->reskeyop = (Oid) 0;
 	}
-	return (new_targetlist);
+	return new_targetlist;
 }
 
 /*
@@ -352,7 +352,7 @@ copy_vars(List *target, List *source)
 
 		result = lappend(result, temp);
 	}
-	return (result);
+	return result;
 }
 
 /*
@@ -436,7 +436,7 @@ flatten_tlist_vars(List *full_tlist, List *flat_tlist)
 											   flat_tlist)));
 	}
 
-	return (result);
+	return result;
 }
 
 /*
@@ -546,7 +546,7 @@ get_expr(TargetEntry *tle)
 	Assert(tle != NULL);
 	Assert(tle->expr != NULL);
 
-	return ((Var *) tle->expr);
+	return (Var *) tle->expr;
 }
 
 
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 7fa3281afa..4f7b0b41b4 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.12 1998/06/15 19:28:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.13 1998/09/01 03:24:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,7 @@ pull_varnos(Node *me)
 			   *result = NIL;
 
 	if (me == NULL)
-		return (NIL);
+		return NIL;
 
 	switch (nodeTag(me))
 	{
@@ -63,7 +63,7 @@ pull_varnos(Node *me)
 		default:
 			break;
 	}
-	return (result);
+	return result;
 }
 
 /*
@@ -154,7 +154,7 @@ pull_var_clause(Node *clause)
 	List	   *retval = NIL;
 
 	if (clause == NULL)
-		return (NIL);
+		return NIL;
 	else if (IsA(clause, Var))
 		retval = lcons(clause, NIL);
 	else if (IsA(clause, Iter))
@@ -202,7 +202,7 @@ pull_var_clause(Node *clause)
 	else
 		retval = NIL;
 
-	return (retval);
+	return retval;
 }
 
 /*
@@ -221,8 +221,8 @@ var_equal(Var *var1, Var *var2)
 		(((Var *) var1)->varattno == ((Var *) var2)->varattno))
 	{
 		Assert(((Var *) var1)->varlevelsup == 0);
-		return (true);
+		return true;
 	}
 	else
-		return (false);
+		return false;
 }