5 files changed, 24 insertions, 24 deletions
diff --git a/src/backend/optimizer/README b/src/backend/optimizer/README
index 0bce226a798..bf67e97e382 100644
--- a/src/backend/optimizer/README
+++ b/src/backend/optimizer/README
@@ -93,8 +93,9 @@ planner()
 
 Optimizer Structures
 --------------------
-Path		- info about every way to access a relation(sequential, index)
-  PathOrder - info about every ordering (sort, merge of relations)
-RelOptInfo	- info about every relation 
-  JoinInfo	- info about join combinations
-RestrictInfo	- info about restrictions
+RelOptInfo		- info about every relation
+  RestrictInfo	- info about restrictions
+  JoinInfo		- info about join combinations
+  Path			- info about every way to access a relation(sequential, index)
+    PathOrder 	- info about every ordering (sort, merge of relations)
+
diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c
index cf393ebb1f9..4cdf4752d37 100644
--- a/src/backend/optimizer/path/hashutils.c
+++ b/src/backend/optimizer/path/hashutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.9 1999/02/03 21:16:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.10 1999/02/04 01:46:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 #include "optimizer/clauses.h"
 
 
-static HInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list);
+static HashInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list);
 
 /*
  * group-clauses-by-hashop--
@@ -54,7 +54,7 @@ group_clauses_by_hashop(List *restrictinfo_list,
 		 */
 		if (hashjoinop)
 		{
-			HInfo	   *xhashinfo = (HInfo *) NULL;
+			HashInfo	   *xhashinfo = (HashInfo *) NULL;
 			Expr	   *clause = restrictinfo->clause;
 			Var		   *leftop = get_leftop(clause);
 			Var		   *rightop = get_rightop(clause);
@@ -77,7 +77,7 @@ group_clauses_by_hashop(List *restrictinfo_list,
 
 			if (xhashinfo == NULL)
 			{
-				xhashinfo = makeNode(HInfo);
+				xhashinfo = makeNode(HashInfo);
 				xhashinfo->hashop = hashjoinop;
 
 				xhashinfo->jmethod.jmkeys = NIL;
@@ -105,21 +105,21 @@ group_clauses_by_hashop(List *restrictinfo_list,
  * Returns the node if it exists.
  *
  */
-static HInfo *
+static HashInfo *
 match_hashop_hashinfo(Oid hashop, List *hashinfo_list)
 {
 	Oid			key = 0;
-	HInfo	   *xhashinfo = (HInfo *) NULL;
+	HashInfo	   *xhashinfo = (HashInfo *) NULL;
 	List	   *i = NIL;
 
 	foreach(i, hashinfo_list)
 	{
-		xhashinfo = (HInfo *) lfirst(i);
+		xhashinfo = (HashInfo *) lfirst(i);
 		key = xhashinfo->hashop;
 		if (hashop == key)
 		{						/* found */
 			return xhashinfo;	/* should be a hashinfo node ! */
 		}
 	}
-	return (HInfo *) NIL;
+	return (HashInfo *) NIL;
 }
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index bd3c3b2410c..991290178f6 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.12 1999/02/03 21:16:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.13 1999/02/04 01:46:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -579,7 +579,7 @@ hash_inner_and_outer(RelOptInfo * joinrel,
 					 RelOptInfo * innerrel,
 					 List *hashinfo_list)
 {
-	HInfo	   *xhashinfo = (HInfo *) NULL;
+	HashInfo	   *xhashinfo = (HashInfo *) NULL;
 	List	   *hjoin_list = NIL;
 	HashPath   *temp_node = (HashPath *) NULL;
 	List	   *i = NIL;
@@ -589,7 +589,7 @@ hash_inner_and_outer(RelOptInfo * joinrel,
 
 	foreach(i, hashinfo_list)
 	{
-		xhashinfo = (HInfo *) lfirst(i);
+		xhashinfo = (HashInfo *) lfirst(i);
 		outerkeys = extract_path_keys(((JoinMethod *) xhashinfo)->jmkeys,
 							  outerrel->targetlist,
 							  OUTER);
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index 908687e6d84..e65c4d7d675 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.17 1998/09/01 04:29:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.18 1999/02/04 01:46:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,7 +29,7 @@ static List *prune_joinrel(RelOptInfo * rel, List *other_rels);
 /*
  * prune-joinrels--
  *	  Removes any redundant relation entries from a list of rel nodes
- *	  'rel-list'.  Obviosly, the first relation can't be a duplicate.
+ *	  'rel-list'.  Obviously, the first relation can't be a duplicate.
  *
  * Returns the resulting list.
  *
@@ -59,7 +59,7 @@ prune_joinrels(List *rel_list)
  *
  */
 static List *
-prune_joinrel(RelOptInfo * rel, List *other_rels)
+prune_joinrel(RelOptInfo *rel, List *other_rels)
 {
 	List	   *i = NIL;
 	List	   *result = NIL;
@@ -135,8 +135,7 @@ prune_rel_path(RelOptInfo * rel, Path *unorderedpath)
 	Path	   *cheapest = set_cheapest(rel, rel->pathlist);
 
 	/* don't prune if not pruneable  -- JMH, 11/23/92 */
-	if (unorderedpath != cheapest
-		&& rel->pruneable)
+	if (unorderedpath != cheapest && rel->pruneable)
 	{
 
 		rel->unorderedpath = (Path *) NULL;
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 55aa83875e2..7bdec4bb4aa 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.16 1999/02/03 21:16:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.17 1999/02/04 01:46:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,7 +62,7 @@ path_is_cheaper(Path *path1, Path *path2)
  *
  */
 Path *
-set_cheapest(RelOptInfo * parent_rel, List *pathlist)
+set_cheapest(RelOptInfo *parent_rel, List *pathlist)
 {
 	List	   *p;
 	Path	   *cheapest_so_far;
@@ -99,7 +99,7 @@ set_cheapest(RelOptInfo * parent_rel, List *pathlist)
  *
  */
 List *
-add_pathlist(RelOptInfo * parent_rel, List *unique_paths, List *new_paths)
+add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths)
 {
 	List	   *x;
 	Path	   *new_path;