Another pgindent run. Fixes enum indenting, and improves #endif

spacing.  Also adds space for one-line comments.

22 files changed, 48 insertions, 28 deletions

diff --git a/src/include/optimizer/_deadcode/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h
index 8d14f90288a..039528dc29f 100644
--- a/src/include/optimizer/_deadcode/xfunc.h
+++ b/src/include/optimizer/_deadcode/xfunc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xfunc.h,v 1.6 2001/10/25 05:50:06 momjian Exp $
+ * $Id: xfunc.h,v 1.7 2001/10/28 06:26:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -79,4 +79,5 @@ extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to);
  * function prototypes for path/predmig.c
  */
 extern bool xfunc_do_predmig(Path root);
+
 #endif	 /* XFUNC_H */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 366e3821169..aa97bcc862c 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauses.h,v 1.46 2001/10/25 05:50:05 momjian Exp $
+ * $Id: clauses.h,v 1.47 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -71,4 +71,5 @@ extern void query_tree_mutator(Query *query, Node *(*mutator) (),
 #define is_subplan(clause)	((clause) != NULL && \
 							 IsA(clause, Expr) && \
 							 ((Expr *) (clause))->opType == SUBPLAN_EXPR)
+
 #endif	 /* CLAUSES_H */
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index b163505875e..46093694b14 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.41 2001/10/25 05:50:05 momjian Exp $
+ * $Id: cost.h,v 1.42 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -94,4 +94,5 @@ extern Selectivity clauselist_selectivity(Query *root,
 extern Selectivity clause_selectivity(Query *root,
 				   Node *clause,
 				   int varRelid);
+
 #endif	 /* COST_H */
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index 8b8e7a59534..bf834d439e9 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo.h,v 1.25 2001/10/25 05:50:05 momjian Exp $
+ * $Id: geqo.h,v 1.26 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,7 +48,7 @@
 /* If you change these, update backend/utils/misc/postgresql.sample.conf */
 extern int	Geqo_pool_size;
 
-#define DEFAULT_GEQO_POOL_SIZE 0/* = default based on no. of relations. */
+#define DEFAULT_GEQO_POOL_SIZE 0	/* = default based on no. of relations. */
 #define MIN_GEQO_POOL_SIZE 128
 #define MAX_GEQO_POOL_SIZE 1024
 
@@ -76,4 +76,5 @@ extern Cost geqo_eval(Query *root, List *initial_rels,
 extern RelOptInfo *gimme_tree(Query *root, List *initial_rels,
 		   Gene *tour, int num_gene,
 		   int rel_count, RelOptInfo *old_rel);
+
 #endif	 /* GEQO_H */
diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h
index 15d7ba4c920..f9cff6bf667 100644
--- a/src/include/optimizer/geqo_copy.h
+++ b/src/include/optimizer/geqo_copy.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_copy.h,v 1.10 2001/10/25 05:50:05 momjian Exp $
+ * $Id: geqo_copy.h,v 1.11 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,4 +25,5 @@
 #include "optimizer/geqo_gene.h"
 
 extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length);
+
 #endif	 /* GEQO_COPY_H */
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index 528ba2bce16..06194d99ca3 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_gene.h,v 1.11 2001/10/25 05:50:05 momjian Exp $
+ * $Id: geqo_gene.h,v 1.12 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,4 +41,5 @@ typedef struct Pool
 	int			size;
 	int			string_length;
 } Pool;
+
 #endif	 /* GEQO_GENE_H */
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 24c7b7a351b..d04f4a5d88a 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.h,v 1.16 2001/10/25 05:50:05 momjian Exp $
+ * $Id: geqo_misc.h,v 1.17 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,4 +32,5 @@ extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene);
 extern void geqo_print_rel(Query *root, RelOptInfo *rel);
 extern void geqo_print_path(Query *root, Path *path, int indent);
 extern void geqo_print_joinclauses(Query *root, List *clauses);
+
 #endif	 /* GEQO_MISC_H */
diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h
index 85d2879ad6c..6754ea95209 100644
--- a/src/include/optimizer/geqo_mutation.h
+++ b/src/include/optimizer/geqo_mutation.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_mutation.h,v 1.10 2001/10/25 05:50:05 momjian Exp $
+ * $Id: geqo_mutation.h,v 1.11 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,4 +25,5 @@
 #include "optimizer/geqo_gene.h"
 
 extern void geqo_mutation(Gene *tour, int num_gene);
+
 #endif	 /* GEQO_MUTATION_H */
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index 6f0db6a7e29..b2eb4cb2415 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_pool.h,v 1.13 2001/10/25 05:50:05 momjian Exp $
+ * $Id: geqo_pool.h,v 1.14 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,4 +37,5 @@ extern void free_chromo(Chromosome *chromo);
 extern void spread_chromo(Chromosome *chromo, Pool *pool);
 
 extern void sort_pool(Pool *pool);
+
 #endif	 /* GEQO_POOL_H */
diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h
index c9293c8f62b..4c5a1ac8ce1 100644
--- a/src/include/optimizer/geqo_random.h
+++ b/src/include/optimizer/geqo_random.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_random.h,v 1.9 2001/10/25 05:50:05 momjian Exp $
+ * $Id: geqo_random.h,v 1.10 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,4 +34,5 @@
 
 #define geqo_randint(upper,lower) \
 	( (int) floor( geqo_rand()*(((upper)-(lower))+0.999999) ) + (lower) )
+
 #endif	 /* GEQO_RANDOM_H */
diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h
index a3d94f7cdfa..9c10cfec9c8 100644
--- a/src/include/optimizer/geqo_selection.h
+++ b/src/include/optimizer/geqo_selection.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_selection.h,v 1.10 2001/10/25 05:50:05 momjian Exp $
+ * $Id: geqo_selection.h,v 1.11 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,4 +26,5 @@
 #include "optimizer/geqo_gene.h"
 
 extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias);
+
 #endif	 /* GEQO_SELECTION_H */
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 9573a2ce510..f905d385098 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.18 2001/10/25 05:50:05 momjian Exp $
+ * $Id: joininfo.h,v 1.19 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,4 +17,5 @@
 #include "nodes/relation.h"
 
 extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
+
 #endif	 /* JOININFO_H */
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index 4de4ffa3675..0c05bbdaa67 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pathnode.h,v 1.39 2001/10/25 05:50:05 momjian Exp $
+ * $Id: pathnode.h,v 1.40 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,4 +75,5 @@ extern RelOptInfo *build_join_rel(Query *root,
 			   RelOptInfo *inner_rel,
 			   JoinType jointype,
 			   List **restrictlist_ptr);
+
 #endif	 /* PATHNODE_H */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 0d57d89bbbb..c725e2126c0 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.57 2001/10/25 05:50:05 momjian Exp $
+ * $Id: paths.h,v 1.58 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -88,12 +88,10 @@ extern RelOptInfo *make_jointree_rel(Query *root, Node *jtnode);
  */
 typedef enum
 {
-				PATHKEYS_EQUAL, /* pathkeys are identical */
-				PATHKEYS_BETTER1,		/* pathkey 1 is a superset of
-										 * pathkey 2 */
-				PATHKEYS_BETTER2,		/* vice versa */
-				PATHKEYS_DIFFERENT		/* neither pathkey includes the
-										 * other */
+	PATHKEYS_EQUAL,				/* pathkeys are identical */
+	PATHKEYS_BETTER1,			/* pathkey 1 is a superset of pathkey 2 */
+	PATHKEYS_BETTER2,			/* vice versa */
+	PATHKEYS_DIFFERENT			/* neither pathkey includes the other */
 } PathKeysComparison;
 
 extern void add_equijoined_keys(Query *root, RestrictInfo *restrictinfo);
@@ -132,4 +130,5 @@ extern int	pathkeys_useful_for_ordering(Query *root, List *pathkeys);
 extern List *truncate_useless_pathkeys(Query *root,
 						  RelOptInfo *rel,
 						  List *pathkeys);
+
 #endif	 /* PATHS_H */
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 1f60ee18df3..5fda9af760b 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plancat.h,v 1.24 2001/10/25 05:50:05 momjian Exp $
+ * $Id: plancat.h,v 1.25 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,4 +36,5 @@ extern Selectivity restriction_selectivity(Query *root,
 extern Selectivity join_selectivity(Query *root,
 				 Oid operator,
 				 List *args);
+
 #endif	 /* PLANCAT_H */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 8831bb45d28..8c5bbf58063 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.52 2001/10/25 05:50:05 momjian Exp $
+ * $Id: planmain.h,v 1.53 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -67,4 +67,5 @@ extern void fix_opids(Node *node);
 extern bool _use_keyset_query_optimizer;
 
 extern void transformKeySetQuery(Query *origNode);
+
 #endif	 /* PLANMAIN_H */
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index acd6ff53260..7db7e5d1656 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planner.h,v 1.21 2001/10/25 05:50:06 momjian Exp $
+ * $Id: planner.h,v 1.22 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,5 @@ extern Plan *subquery_planner(Query *parse, double tuple_fraction);
 
 extern Plan *make_sortplan(Query *parse, List *tlist,
 			  Plan *plannode, List *sortcls);
+
 #endif	 /* PLANNER_H */
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index e4a55e662c4..e6fa5c437fc 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prep.h,v 1.29 2001/10/25 05:50:06 momjian Exp $
+ * $Id: prep.h,v 1.30 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,4 +42,5 @@ extern List *expand_inherted_rtentry(Query *parse, Index rti,
 extern Node *adjust_inherited_attrs(Node *node,
 					   Index old_rt_index, Oid old_relid,
 					   Index new_rt_index, Oid new_relid);
+
 #endif	 /* PREP_H */
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index 186cf288326..6fb0fb22eea 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: restrictinfo.h,v 1.12 2001/10/25 05:50:06 momjian Exp $
+ * $Id: restrictinfo.h,v 1.13 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,4 +20,5 @@ extern bool restriction_is_or_clause(RestrictInfo *restrictinfo);
 extern List *get_actual_clauses(List *restrictinfo_list);
 extern void get_actual_join_clauses(List *restrictinfo_list,
 						List **joinquals, List **otherquals);
+
 #endif	 /* RESTRICTINFO_H */
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index a56fed5914e..9c56a7592ba 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -17,4 +17,5 @@ extern int	PlannerPlanId;		/* to assign unique ID to subquery plans */
 extern List *SS_finalize_plan(Plan *plan);
 extern Node *SS_replace_correlation_vars(Node *expr);
 extern Node *SS_process_sublinks(Node *expr);
+
 #endif	 /* SUBSELECT_H */
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 796649d5964..44c4965bf6b 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.29 2001/10/25 05:50:06 momjian Exp $
+ * $Id: tlist.h,v 1.30 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,4 +32,5 @@ extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause,
 						List *targetList);
 extern Node *get_sortgroupclause_expr(SortClause *sortClause,
 						 List *targetList);
+
 #endif	 /* TLIST_H */
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index 536fc839e10..9d3fdc5e51b 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: var.h,v 1.15 2001/10/25 05:50:06 momjian Exp $
+ * $Id: var.h,v 1.16 2001/10/28 06:26:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,4 +22,5 @@ extern bool contain_var_reference(Node *node, int varno, int varattno,
 extern bool contain_whole_tuple_var(Node *node, int varno, int levelsup);
 extern bool contain_var_clause(Node *node);
 extern List *pull_var_clause(Node *node, bool includeUpperVars);
+
 #endif	 /* VAR_H */