Change my-function-name-- to my_function_name, and optimizer renames.

11 files changed, 130 insertions, 130 deletions

diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 9df6b6a2a5..26ca673359 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * clauses.c--
+ * clauses.c
  *	  routines to manipulate qualification clauses
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.28 1999/02/03 21:16:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.29 1999/02/13 23:16:42 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -71,7 +71,7 @@ make_clause(int type, Node *oper, List *args)
 
 
 /*
- * is_opclause--
+ * is_opclause
  *
  * Returns t iff the clause is an operator clause:
  *				(op expr expr) or (op expr).
@@ -88,7 +88,7 @@ is_opclause(Node *clause)
 }
 
 /*
- * make_opclause--
+ * make_opclause
  *	  Creates a clause given its operator left operand and right
  *	  operand (if it is non-null).
  *
@@ -106,7 +106,7 @@ make_opclause(Oper *op, Var *leftop, Var *rightop)
 }
 
 /*
- * get_leftop--
+ * get_leftop
  *
  * Returns the left operand of a clause of the form (op expr expr)
  *		or (op expr)
@@ -151,7 +151,7 @@ agg_clause(Node *clause)
  *****************************************************************************/
 
 /*
- * is_funcclause--
+ * is_funcclause
  *
  * Returns t iff the clause is a function clause: (func { expr }).
  *
@@ -164,7 +164,7 @@ is_funcclause(Node *clause)
 }
 
 /*
- * make_funcclause--
+ * make_funcclause
  *
  * Creates a function clause given the FUNC node and the functional
  * arguments.
@@ -187,7 +187,7 @@ make_funcclause(Func *func, List *funcargs)
  *****************************************************************************/
 
 /*
- * or_clause--
+ * or_clause
  *
  * Returns t iff the clause is an 'or' clause: (OR { expr }).
  *
@@ -201,7 +201,7 @@ or_clause(Node *clause)
 }
 
 /*
- * make_orclause--
+ * make_orclause
  *
  * Creates an 'or' clause given a list of its subclauses.
  *
@@ -223,7 +223,7 @@ make_orclause(List *orclauses)
  *****************************************************************************/
 
 /*
- * not_clause--
+ * not_clause
  *
  * Returns t iff this is a 'not' clause: (NOT expr).
  *
@@ -236,7 +236,7 @@ not_clause(Node *clause)
 }
 
 /*
- * make_notclause--
+ * make_notclause
  *
  * Create a 'not' clause given the expression to be negated.
  *
@@ -254,7 +254,7 @@ make_notclause(Expr *notclause)
 }
 
 /*
- * get_notclausearg--
+ * get_notclausearg
  *
  * Retrieve the clause within a 'not' clause
  *
@@ -271,7 +271,7 @@ get_notclausearg(Expr *notclause)
 
 
 /*
- * and_clause--
+ * and_clause
  *
  * Returns t iff its argument is an 'and' clause: (AND { expr }).
  *
@@ -284,7 +284,7 @@ and_clause(Node *clause)
 }
 
 /*
- * make_andclause--
+ * make_andclause
  *
  * Create an 'and' clause given its arguments in a list.
  *
@@ -308,7 +308,7 @@ make_andclause(List *andclauses)
 
 
 /*
- * case_clause--
+ * case_clause
  *
  * Returns t iff its argument is a 'case' clause: (CASE { expr }).
  *
@@ -328,7 +328,7 @@ case_clause(Node *clause)
 
 
 /*
- * pull-constant-clauses--
+ * pull_constant_clauses
  *	  Scans through a list of qualifications and find those that
  *	  contain no variables.
  *
@@ -356,7 +356,7 @@ pull_constant_clauses(List *quals, List **constantQual)
 }
 
 /*
- * clause-relids-vars--
+ * clause_relids_vars
  *	  Retrieves relids and vars appearing within a clause.
  *	  Returns ((relid1 relid2 ... relidn) (var1 var2 ... varm)) where
  *	  vars appear in the clause  this is done by recursively searching
@@ -399,8 +399,8 @@ clause_get_relids_vars(Node *clause, List **relids, List **vars)
 }
 
 /*
- * NumRelids--
- *		(formerly clause-relids)
+ * NumRelids
+ *		(formerly clause_relids)
  *
  * Returns the number of different relations referenced in 'clause'.
  */
@@ -423,7 +423,7 @@ NumRelids(Node *clause)
 }
 
 /*
- * contains-not--
+ * contains_not
  *
  * Returns t iff the clause is a 'not' clause or if any of the
  * subclauses within an 'or' clause contain 'not's.
@@ -453,7 +453,7 @@ contains_not(Node *clause)
 }
 
 /*
- * is_joinable--
+ * is_joinable
  *
  * Returns t iff 'clause' is a valid join clause.
  *
@@ -487,7 +487,7 @@ is_joinable(Node *clause)
 }
 
 /*
- * qual-clause-p--
+ * qual_clause_p
  *
  * Returns t iff 'clause' is a valid qualification clause.
  *
@@ -509,7 +509,7 @@ qual_clause_p(Node *clause)
 }
 
 /*
- * fix-opid--
+ * fix_opid
  *	  Calculate the opfid from the opno...
  *
  * Returns nothing.
@@ -571,7 +571,7 @@ fix_opid(Node *clause)
 }
 
 /*
- * fix-opids--
+ * fix_opids
  *	  Calculate the opfid from the opno for all the clauses...
  *
  * Returns its argument.
@@ -589,7 +589,7 @@ fix_opids(List *clauses)
 }
 
 /*
- * get_relattval--
+ * get_relattval
  *		For a non-join clause, returns a list consisting of the
  *				relid,
  *				attno,
@@ -716,7 +716,7 @@ get_relattval(Node *clause,
 }
 
 /*
- * get_relsatts--
+ * get_relsatts
  *
  * Returns a list
  *				( relid1 attno1 relid2 attno2 )
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index dafeb8ddee..64fcbbf851 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * indexnode.c--
+ * indexnode.c
  *	  Routines to find all indices on a relation
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.13 1999/02/12 05:56:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.14 1999/02/13 23:16:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
 static List *find_secondary_index(Query *root, Oid relid);
 
 /*
- * find-relation-indices--
+ * find_relation_indices
  *	  Returns a list of index nodes containing appropriate information for
  *	  each (secondary) index defined on a relation.
  *
@@ -42,7 +42,7 @@ find_relation_indices(Query *root, RelOptInfo *rel)
 }
 
 /*
- * find-secondary-index--
+ * find_secondary_index
  *	  Creates a list of index path nodes containing information for each
  *	  secondary index defined on a relation by searching through the index
  *	  catalog.
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index dc28c95d79..4b9dce6e5a 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * joininfo.c--
+ * joininfo.c
  *	  JoinInfo node manipulation routines
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.14 1999/02/10 21:02:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.15 1999/02/13 23:16:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,16 +22,16 @@
 
 
 /*
- * joininfo-member--
+ * joininfo_member
  *	  Determines whether a node has already been created for a join
  *	  between a set of join relations and the relation described by
- *	  'joininfo-list'.
+ *	  'joininfo_list'.
  *
- * 'join-relids' is a list of relids corresponding to the join relation
- * 'joininfo-list' is the list of joininfo nodes against which this is
+ * 'join_relids' is a list of relids corresponding to the join relation
+ * 'joininfo_list' is the list of joininfo nodes against which this is
  *				checked
  *
- * Returns the corresponding node in 'joininfo-list' if such a node
+ * Returns the corresponding node in 'joininfo_list' if such a node
  * exists.
  *
  */
@@ -52,9 +52,9 @@ joininfo_member(List *join_relids, List *joininfo_list)
 
 
 /*
- * find-joininfo-node--
+ * find_joininfo_node
  *	  Find the joininfo node within a relation entry corresponding
- *	  to a join between 'this_rel' and the relations in 'join-relids'.	A
+ *	  to a join between 'this_rel' and the relations in 'join_relids'.	A
  *	  new node is created and added to the relation entry's joininfo
  *	  field if the desired one can't be found.
  *
@@ -81,7 +81,7 @@ find_joininfo_node(RelOptInfo *this_rel, List *join_relids)
 }
 
 /*
- * other-join-clause-var--
+ * other_join_clause_var
  *	  Determines whether a var node is contained within a joinclause
  *	  of the form(op var var).
  *
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index b82c807e7e..cfd2f26d26 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * keys.c--
+ * keys.c
  *	  Key manipulation routines
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.16 1999/02/11 17:00:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.17 1999/02/13 23:16:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@ static bool equal_indexkey_var(int index_key, Var *var);
  *		where subkeyI is a var node
  *		note that the 'Keys field is a list of these
  * 3. join key
- *		(outer-subkey inner-subkey)
+ *		(outer_subkey inner_subkey)
  *				where each subkey is a var node
  * 4. sort key
  *		one of:
@@ -48,8 +48,8 @@ static bool equal_indexkey_var(int index_key, Var *var);
  */
 
 /*
- * match-indexkey-operand--
- *	  Returns t iff an index key 'index-key' matches the given clause
+ * match_indexkey_operand
+ *	  Returns t iff an index key 'index_key' matches the given clause
  *	  operand.
  *
  */
@@ -65,8 +65,8 @@ match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel)
 }
 
 /*
- * equal_indexkey_var--
- *	  Returns t iff an index key 'index-key' matches the corresponding
+ * equal_indexkey_var
+ *	  Returns t iff an index key 'index_key' matches the corresponding
  *	  fields of var node 'var'.
  *
  */
@@ -80,7 +80,7 @@ equal_indexkey_var(int index_key, Var *var)
 }
 
 /*
- * extract-join-subkey--
+ * extract_join_subkey
  *	 Returns the subkey in a join key corresponding to the outer or inner
  *	 relation.
  *
@@ -106,7 +106,7 @@ extract_join_subkey(JoinKey *jk, int which_subkey)
 }
 
 /*
- * pathkeys_match--
+ * pathkeys_match
  *	  Returns t iff two sets of path keys are equivalent.  They are
  *	  equivalent if the first Var nodes match the second Var nodes.
  *
@@ -169,14 +169,14 @@ pathkeys_match(List *keys1, List *keys2, int *better_key)
 }
 
 /*
- * collect-index-pathkeys--
+ * collect_index_pathkeys
  *	  Creates a list of subkeys by retrieving var nodes corresponding to
- *	  each index key in 'index-keys' from the relation's target list
+ *	  each index key in 'index_keys' from the relation's target list
  *	  'tlist'.	If the key is not in the target list, the key is irrelevant
  *	  and is thrown away.  The returned subkey list is of the form:
  *				((var1) (var2) ... (varn))
  *
- * 'index-keys' is a list of index keys
+ * 'index_keys' is a list of index keys
  * 'tlist' is a relation target list
  *
  * Returns the list of cons'd subkeys.
diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c
index 268f16df0e..eef0fbb314 100644
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * ordering.c--
+ * ordering.c
  *	  Routines to manipulate and compare merge and path orderings
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.14 1999/02/11 21:05:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.15 1999/02/13 23:16:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,7 @@ static bool sortops_order_match(Oid *ordering1, Oid *ordering2,
 								int *better_sort);
 
 /*
- * equal-path-ordering--
+ * equal_path_ordering
  *	  Returns t iff two path orderings are equal.
  *
  */
@@ -83,7 +83,7 @@ pathorder_match(PathOrder *path_ordering1,
 }
 
 /*
- * equal-path-merge-ordering--
+ * equal_path_merge_ordering
  *	  Returns t iff a path ordering is usable for ordering a merge join.
  *
  * XXX	Presently, this means that the first sortop of the path matches
@@ -106,7 +106,7 @@ equal_path_merge_ordering(Oid *path_ordering,
 }
 
 /*
- * equal-merge-ordering--
+ * equal_merge_ordering
  *	  Returns t iff two merge orderings are equal.
  *
  */
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 5618ae6b76..cf3072a8be 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * pathnode.c--
+ * pathnode.c
  *	  Routines to manipulate pathlists and create path nodes
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.34 1999/02/12 06:43:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.35 1999/02/13 23:16:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,7 @@ static Path *better_path(Path *new_path, List *unique_paths, bool *is_new);
  *****************************************************************************/
 
 /*
- * path-is-cheaper--
+ * path_is_cheaper
  *	  Returns t iff 'path1' is cheaper than 'path2'.
  *
  */
@@ -51,11 +51,11 @@ path_is_cheaper(Path *path1, Path *path2)
 }
 
 /*
- * set_cheapest--
+ * set_cheapest
  *	  Finds the minimum cost path from among a relation's paths.
  *
- * 'parent-rel' is the parent relation
- * 'pathlist' is a list of path nodes corresponding to 'parent-rel'
+ * 'parent_rel' is the parent relation
+ * 'pathlist' is a list of path nodes corresponding to 'parent_rel'
  *
  * Returns and sets the relation entry field with the pathnode that
  * is minimum.
@@ -86,14 +86,14 @@ set_cheapest(RelOptInfo *parent_rel, List *pathlist)
 }
 
 /*
- * add_pathlist--
- *	  For each path in the list 'new-paths', add to the list 'unique-paths'
+ * add_pathlist
+ *	  For each path in the list 'new_paths', add to the list 'unique_paths'
  *	  only those paths that are unique (i.e., unique ordering and ordering
  *	  keys).  Should a conflict arise, the more expensive path is thrown out,
  *	  thereby pruning the plan space.  But we don't prune if xfunc
  *	  told us not to.
  *
- * 'parent-rel' is the relation entry to which these paths correspond.
+ * 'parent_rel' is the relation entry to which these paths correspond.
  *
  * Returns the list of unique pathnodes.
  *
@@ -140,15 +140,15 @@ add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths)
 }
 
 /*
- * better_path--
- *	  Determines whether 'new-path' has the same ordering and keys as some
- *	  path in the list 'unique-paths'.	If there is a redundant path,
+ * better_path
+ *	  Determines whether 'new_path' has the same ordering and keys as some
+ *	  path in the list 'unique_paths'.	If there is a redundant path,
  *	  eliminate the more expensive path.
  *
  * Returns:
- *	  The old path - if 'new-path' matches some path in 'unique-paths' and is
+ *	  The old path - if 'new_path' matches some path in 'unique_paths' and is
  *				cheaper
- *	  nil - if 'new-path' matches but isn't cheaper
+ *	  nil - if 'new_path' matches but isn't cheaper
  *	  t - if there is no path in the list with the same ordering and keys
  *
  */
@@ -269,7 +269,7 @@ better_path(Path *new_path, List *unique_paths, bool *is_new)
  *****************************************************************************/
 
 /*
- * create_seqscan_path--
+ * create_seqscan_path
  *	  Creates a path corresponding to a sequential scan, returning the
  *	  pathnode.
  *
@@ -290,7 +290,7 @@ create_seqscan_path(RelOptInfo *rel)
 	pathnode->pathkeys = NIL;
 
 	/*
-	 * copy restrictinfo list into path for expensive function processing --
+	 * copy restrictinfo list into path for expensive function processing 
 	 * JMH, 7/7/92
 	 */
 	pathnode->loc_restrictinfo = (List *) copyObject((Node *) rel->restrictinfo);
@@ -311,13 +311,13 @@ create_seqscan_path(RelOptInfo *rel)
 }
 
 /*
- * create_index_path--
+ * create_index_path
  *	  Creates a single path node for an index scan.
  *
  * 'rel' is the parent rel
  * 'index' is the pathnode for the index on 'rel'
- * 'restriction-clauses' is a list of restriction clause nodes.
- * 'is-join-scan' is a flag indicating whether or not the index is being
+ * 'restriction_clauses' is a list of restriction clause nodes.
+ * 'is_join_scan' is a flag indicating whether or not the index is being
  *		considered because of its sort order.
  *
  * Returns the new path node.
@@ -343,7 +343,7 @@ create_index_path(Query *root,
 	pathnode->indexqual = NIL;
 
 	/*
-	 * copy restrictinfo list into path for expensive function processing --
+	 * copy restrictinfo list into path for expensive function processing 
 	 * JMH, 7/7/92
 	 */
 	pathnode->path.loc_restrictinfo = set_difference((List *) copyObject((Node *) rel->restrictinfo),
@@ -460,7 +460,7 @@ create_index_path(Query *root,
 }
 
 /*
- * create_nestloop_path--
+ * create_nestloop_path
  *	  Creates a pathnode corresponding to a nestloop join between two
  *	  relations.
  *
@@ -523,7 +523,7 @@ create_nestloop_path(RelOptInfo *joinrel,
 }
 
 /*
- * create_mergejoin_path--
+ * create_mergejoin_path
  *	  Creates a pathnode corresponding to a mergejoin join between
  *	  two relations
  *
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 0a85255394..79d6c2fe31 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * plancat.c--
+ * plancat.c
  *	   routines for accessing the system catalogs
  *
  *
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.24 1999/02/03 21:16:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.25 1999/02/13 23:16:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,7 @@ static void IndexSelectivity(Oid indexrelid, Oid indrelid, int32 nIndexKeys,
 
 
 /*
- * relation-info -
+ * relation_info -
  *	  Retrieves catalog information for a given relation. Given the oid of
  *	  the relation, return the following information:
  *				whether the relation has secondary indices
@@ -85,7 +85,7 @@ relation_info(Query *root, Index relid,
 
 
 /*
- * index-info--
+ * index_info
  *	  Retrieves catalog information on an index on a given relation.
  *
  *	  The index relation is opened on the first invocation. The current
@@ -225,7 +225,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
 }
 
 /*
- * index-selectivity--
+ * index_selectivity
  *
  *	  Call util/plancat.c:IndexSelectivity with the indicated arguments.
  *
@@ -308,7 +308,7 @@ index_selectivity(Oid indid,
 }
 
 /*
- * restriction_selectivity in lisp system.--
+ * restriction_selectivity in lisp system.
  *
  *	  NOTE: The routine is now merged with RestrictionClauseSelectivity
  *	  as defined in plancat.c
@@ -349,7 +349,7 @@ restriction_selectivity(Oid functionObjectId,
 }
 
 /*
- * join_selectivity--
+ * join_selectivity
  *	  Similarly, this routine is merged with JoinClauseSelectivity in
  *	  plancat.c
  *
@@ -388,7 +388,7 @@ join_selectivity(Oid functionObjectId,
 }
 
 /*
- * find_all_inheritors--
+ * find_all_inheritors
  *
  * Returns a LISP list containing the OIDs of all relations which
  * inherits from the relation with OID 'inhparent'.
@@ -424,7 +424,7 @@ find_inheritance_children(Oid inhparent)
 
 #ifdef NOT_USED
 /*
- * VersionGetParents--
+ * VersionGetParents
  *
  * Returns a LISP list containing the OIDs of all relations which are
  * base relations of the relation with OID 'verrelid'.
@@ -469,7 +469,7 @@ VersionGetParents(Oid verrelid)
  *****************************************************************************/
 
 /*
- * IdexSelectivity--
+ * IdexSelectivity
  *
  *	  Retrieves the 'amopnpages' and 'amopselect' parameters for each
  *	  AM operator when a given index (specified by 'indexrelid') is used.
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index fd474f65c0..1b0c1d6947 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * relnode.c--
+ * relnode.c
  *	  Relation manipulation routines
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.12 1999/02/12 05:56:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.13 1999/02/13 23:16:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,7 @@
 
 
 /*
- * get_base_rel--
+ * get_base_rel
  *	  Returns relation entry corresponding to 'relid', creating a new one if
  *	  necessary. This is for base relations.
  *
@@ -93,7 +93,7 @@ get_base_rel(Query *root, int relid)
 }
 
 /*
- * get_join_rel--
+ * get_join_rel
  *	  Returns relation entry corresponding to 'relid' (a list of relids),
  *	  creating a new one if necessary. This is for join relations.
  *
@@ -105,7 +105,7 @@ get_join_rel(Query *root, List *relid)
 }
 
 /*
- * rel-member--
+ * rel_member
  *	  Determines whether a relation of id 'relid' is contained within a list
  *	  'rels'.
  *
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 22ffe665e2..374533a422 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * restrictinfo.c--
+ * restrictinfo.c
  *	  RestrictInfo node manipulation routines.
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.1 1999/02/05 19:59:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.2 1999/02/13 23:16:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,13 +21,13 @@
 #include "optimizer/restrictinfo.h"
 
 /*
- * valid-or-clause--
+ * valid_or_clause
  *
  * Returns t iff the restrictinfo node contains a 'normal' 'or' clause.
  *
  */
 bool
-valid_or_clause(RestrictInfo * restrictinfo)
+valid_or_clause(RestrictInfo *restrictinfo)
 {
 	if (restrictinfo != NULL &&
 		!single_node((Node *) restrictinfo->clause) &&
@@ -39,9 +39,9 @@ valid_or_clause(RestrictInfo * restrictinfo)
 }
 
 /*
- * get-actual-clauses--
+ * get_actual_clauses
  *
- * Returns a list containing the clauses from 'restrictinfo-list'.
+ * Returns a list containing the clauses from 'restrictinfo_list'.
  *
  */
 List *
@@ -68,7 +68,7 @@ get_actual_clauses(List *restrictinfo_list)
  */
 
 /*
- * get_relattvals--
+ * get_relattvals
  *	  For each member of  a list of restrictinfo nodes to be used with an
  *	  index, create a vectori-long specifying:
  *				the attnos,
@@ -79,7 +79,7 @@ get_actual_clauses(List *restrictinfo_list)
  *	  flag indicating whether the constant is on the left or right should
  *	  always be *SELEC-CONSTANT-RIGHT*.
  *
- * 'restrictinfo-list' is a list of restrictinfo nodes
+ * 'restrictinfo_list' is a list of restrictinfo nodes
  *
  * Returns a list of vectori-longs.
  *
@@ -117,7 +117,7 @@ get_relattvals(List *restrictinfo_list,
 }
 
 /*
- * get_joinvars --
+ * get_joinvars 
  *	  Given a list of join restrictinfo nodes to be used with the index
  *	  of an inner join relation, return three lists consisting of:
  *				the attributes corresponding to the inner join relation
@@ -126,7 +126,7 @@ get_relattvals(List *restrictinfo_list,
  *						the operator.
  *
  * 'relid' is the inner join relation
- * 'restrictinfo-list' is a list of qualification clauses to be used with
+ * 'restrictinfo_list' is a list of qualification clauses to be used with
  *		'rel'
  *
  */
@@ -168,7 +168,7 @@ get_joinvars(Oid relid,
 }
 
 /*
- * get_opnos--
+ * get_opnos
  *	  Create and return a list containing the clause operators of each member
  *	  of a list of restrictinfo nodes to be used with an index.
  *
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index f844ca8906..29013f59ff 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * tlist.c--
+ * tlist.c
  *	  Target list manipulation routines
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.25 1999/02/10 21:02:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.26 1999/02/13 23:16:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,13 +34,13 @@ static Node *flatten_tlistentry(Node *tlistentry, List *flat_tlist);
  *****************************************************************************/
 
 /*
- * tlistentry-member--
+ * tlistentry_member
  *
  * RETURNS:  the leftmost member of sequence "targetlist" that satisfies
  *			 the predicate "var_equal"
  * MODIFIES: nothing
  * REQUIRES: test = function which can operate on a lispval union
- *			 var = valid var-node
+ *			 var = valid var_node
  *			 targetlist = valid sequence
  */
 TargetEntry *
@@ -61,7 +61,7 @@ tlistentry_member(Var *var, List *targetlist)
 }
 
 /*
- * matching_tlvar--
+ * matching_tlvar
  *
  * RETURNS:  var node in a target list which is var_equal to 'var',
  *			 if one exists.
@@ -81,7 +81,7 @@ matching_tlvar(Var *var, List *targetlist)
 }
 
 /*
- * add_tl_element--
+ * add_var_to_tlist
  *	  Creates a targetlist entry corresponding to the supplied var node
  *
  * 'var' and adds the new targetlist entry to the targetlist field of
@@ -90,10 +90,10 @@ matching_tlvar(Var *var, List *targetlist)
  * RETURNS: nothing
  * MODIFIES: vartype and varid fields of leftmost varnode that matches
  *			 argument "var" (sometimes).
- * CREATES:  new var-node iff no matching var-node exists in targetlist
+ * CREATES:  new var_node iff no matching var_node exists in targetlist
  */
 void
-add_tl_element(RelOptInfo *rel, Var *var)
+add_var_to_tlist(RelOptInfo *rel, Var *var)
 {
 	Expr	   *oldvar = (Expr *) NULL;
 
@@ -121,12 +121,12 @@ add_tl_element(RelOptInfo *rel, Var *var)
 }
 
 /*
- * create_tl_element--
+ * create_tl_element
  *	  Creates a target list entry node and its associated (resdom var) pair
  *	  with its resdom number equal to 'resdomno' and the joinlist field set
  *	  to 'joinlist'.
  *
- * RETURNS:  newly created tlist-entry
+ * RETURNS:  newly created tlist_entry
  * CREATES:  new targetlist entry (always).
  */
 TargetEntry *
@@ -144,7 +144,7 @@ create_tl_element(Var *var, int resdomno)
 }
 
 /*
- * get-actual-tlist--
+ * get_actual_tlist
  *	  Returns the targetlist elements from a relation tlist.
  *
  */
@@ -184,7 +184,7 @@ get_actual_tlist(List *tlist)
  *****************************************************************************/
 
 /*
- * tlist-member--
+ * tlist_member
  *	  Determines whether a var node is already contained within a
  *	  target list.
  *
@@ -245,7 +245,7 @@ tlist_resdom(List *tlist, Resdom *resnode)
 
 
 /*
- * match_varid--
+ * match_varid
  *	  Searches a target list for an entry with some desired varid.
  *
  * 'varid' is the desired id
@@ -299,7 +299,7 @@ match_varid(Var *test_var, List *tlist)
 
 
 /*
- * new-unsorted-tlist--
+ * new_unsorted_tlist
  *	  Creates a copy of a target list by creating new resdom nodes
  *	  without sort information.
  *
@@ -325,7 +325,7 @@ new_unsorted_tlist(List *targetlist)
 }
 
 /*
- * copy-vars--
+ * copy_vars
  *	  Replaces the var nodes in the first target list with those from
  *	  the second target list.  The two target lists are assumed to be
  *	  identical except their actual resdoms and vars are different.
@@ -355,7 +355,7 @@ copy_vars(List *target, List *source)
 }
 
 /*
- * flatten-tlist--
+ * flatten_tlist
  *	  Create a target list that only contains unique variables.
  *
  *
@@ -407,13 +407,13 @@ flatten_tlist(List *tlist)
 }
 
 /*
- * flatten-tlist-vars--
+ * flatten_tlist_vars
  *	  Redoes the target list of a query with no nested attributes by
  *	  replacing vars within computational expressions with vars from
  *	  the 'flattened' target list of the query.
  *
- * 'full-tlist' is the actual target list
- * 'flat-tlist' is the flattened (var-only) target list
+ * 'full_tlist' is the actual target list
+ * 'flat_tlist' is the flattened (var-only) target list
  *
  * Returns the modified actual target list.
  *
@@ -437,12 +437,12 @@ flatten_tlist_vars(List *full_tlist, List *flat_tlist)
 }
 
 /*
- * flatten-tlistentry--
+ * flatten_tlistentry
  *	  Replaces vars within a target list entry with vars from a flattened
  *	  target list.
  *
  * 'tlistentry' is the target list entry to be modified
- * 'flat-tlist' is the flattened target list
+ * 'flat_tlist' is the flattened target list
  *
  * Returns the (modified) target_list entry from the target list.
  *
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 462fd9e7df..0e4b350c52 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * var.c--
+ * var.c
  *	  Var node manipulation routines
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.15 1999/01/24 00:28:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.16 1999/02/13 23:16:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -67,7 +67,7 @@ pull_varnos(Node *me)
 }
 
 /*
- * contain_var_clause--
+ * contain_var_clause
  *	  Recursively find var nodes from a clause by pulling vars from the
  *	  left and right operands of the clause.
  *
@@ -157,7 +157,7 @@ contain_var_clause(Node *clause)
 }
 
 /*
- * pull_var_clause--
+ * pull_var_clause
  *	  Recursively pulls all var nodes from a clause by pulling vars from the
  *	  left and right operands of the clause.
  *