Mark functions as static and ifdef NOT_USED as appropriate.

29 files changed, 158 insertions, 86 deletions

diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 48872cdf680..fc7ac6dcb14 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.44 2000/05/30 04:24:32 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.45 2000/06/08 22:36:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -207,6 +207,7 @@ StrategyEvaluationIsValid(StrategyEvaluation evaluation)
 
 #endif
 
+#ifdef NOT_USED
 /* ----------------
  *		StrategyTermEvaluate
  * ----------------
@@ -262,7 +263,7 @@ StrategyTermEvaluate(StrategyTerm term,
 
 	return result;
 }
-
+#endif
 
 /* ----------------
  *		RelationGetStrategy
@@ -340,6 +341,7 @@ RelationGetStrategy(Relation relation,
 	return strategy;
 }
 
+#ifdef NOT_USED
 /* ----------------
  *		RelationInvokeStrategy
  * ----------------
@@ -463,6 +465,7 @@ RelationInvokeStrategy(Relation relation,
 
 
 }
+#endif
 
 /* ----------------
  *		OperatorRelationFillScanKeyEntry
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 0ec7af2cf96..7d65c63dc80 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.58 2000/05/30 04:24:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.59 2000/06/08 22:36:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,8 @@ static OffsetNumber _bt_pgaddtup(Relation rel, Buffer buf, int keysz, ScanKey it
 static bool _bt_goesonpg(Relation rel, Buffer buf, Size keysz, ScanKey scankey, BTItem afteritem);
 static void _bt_updateitem(Relation rel, Size keysz, Buffer buf, BTItem oldItem, BTItem newItem);
 static bool _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum, int keysz, ScanKey scankey);
+static int32 _bt_tuplecompare(Relation rel, Size keysz, ScanKey scankey,
+				 IndexTuple tuple1, IndexTuple tuple2);
 
 /*
  *	_bt_doinsert() -- Handle insertion of a single btitem in the tree.
@@ -1360,7 +1362,7 @@ _bt_goesonpg(Relation rel,
  *							  return -1, 0, or +1
  *
  */
-int32
+static int32
 _bt_tuplecompare(Relation rel,
 				 Size keysz,
 				 ScanKey scankey,
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 18ac77cd9e2..cd20e231ecb 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.65 2000/05/30 00:49:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.66 2000/06/08 22:36:54 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -901,6 +901,7 @@ StartTransaction()
 
 }
 
+#ifdef NOT_USED
 /* ---------------
  * Tell me if we are currently in progress
  * ---------------
@@ -910,6 +911,7 @@ CurrentXactInProgress()
 {
 	return CurrentTransactionState->state == TRANS_INPROGRESS;
 }
+#endif
 
 /* --------------------------------
  *		CommitTransaction
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 445f1caf2a5..52d36477ca5 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.113 2000/05/30 04:24:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.114 2000/06/08 22:36:59 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -75,6 +75,7 @@ static void DefaultBuild(Relation heapRelation, Relation indexRelation,
 			 IndexStrategy indexStrategy, uint16 parameterCount,
 		Datum *parameter, FuncIndexInfoPtr funcInfo, PredInfo *predInfo);
 static Oid	IndexGetRelation(Oid indexId);
+static bool activate_index(Oid indexId, bool activate);
 
 static bool reindexing = false;
 extern bool
@@ -2044,7 +2045,7 @@ IndexIsUniqueNoCache(Oid indexId)
  *		status per index
  * ---------------------------------
  */
-bool
+static bool
 activate_index(Oid indexId, bool activate)
 {
 	if (!activate)				/* Currently does nothing */
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index f80ed611238..ae5d3d2e9fe 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.64 2000/06/07 04:09:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.65 2000/06/08 22:37:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -193,14 +193,11 @@ Async_Listen(char *relname, int pid)
 {
 	Relation	lRel;
 	TupleDesc	tdesc;
-	HeapScanDesc scan;
 	HeapTuple	tuple,
 				newtup;
 	Datum		values[Natts_pg_listener];
 	char		nulls[Natts_pg_listener];
-	Datum		d;
 	int			i;
-	bool		isnull;
 	TupleDesc	tupDesc;
 
 	if (Trace_notify)
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index 9739c68ffda..2b9bf4d7723 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -49,6 +49,7 @@ static void CommentAggregate(char *aggregate, char *aggtype, char *comment);
 static void CommentProc(char *function, List *arguments, char *comment);
 static void CommentOperator(char *opname, List *arguments, char *comment);
 static void CommentTrigger(char *trigger, char *relation, char *comments);
+static void	CreateComments(Oid oid, char *comment);
 
 /*------------------------------------------------------------------
  * CommentObject --
@@ -120,7 +121,7 @@ CommentObject(int objtype, char *objname, char *objproperty,
  *------------------------------------------------------------------
  */
 
-void
+static void
 CreateComments(Oid oid, char *comment)
 {
 
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 01dd8567e16..62d88caf393 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.68 2000/05/30 00:49:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.69 2000/06/08 22:37:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,6 +38,9 @@ static HeapTuple GetTupleForTrigger(EState *estate, ItemPointer tid,
 static HeapTuple ExecCallTriggerFunc(Trigger *trigger,
 									 TriggerData *trigdata);
 
+static void DeferredTriggerSaveEvent(Relation rel, int event,
+						 HeapTuple oldtup, HeapTuple newtup);
+
 
 void
 CreateTrigger(CreateTrigStmt *stmt)
@@ -1776,7 +1779,7 @@ DeferredTriggerSetState(ConstraintsSetStmt *stmt)
  *	Called by ExecAR...Triggers() to add the event to the queue.
  * ----------
  */
-void
+static void
 DeferredTriggerSaveEvent(Relation rel, int event,
 						 HeapTuple oldtup, HeapTuple newtup)
 {
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index f33f4f1b1b3..e4fbf34727a 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.7 2000/05/30 00:49:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.8 2000/06/08 22:37:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
  *		ExecTidReScan		rescans the tid relation.
  *		ExecEndTidScan		releases all storage.
  *		ExecTidMarkPos		marks scan position.
- *		ExecTidRestrPos		restores scan position.
  *
  */
 #include "postgres.h"
@@ -353,6 +352,7 @@ ExecTidMarkPos(TidScan *node)
 	tidstate->tss_MarkTidPtr = tidstate->tss_TidPtr;
 }
 
+#ifdef NOT_USED
 /* ----------------------------------------------------------------
  *		ExecTidRestrPos
  *
@@ -370,6 +370,7 @@ ExecTidRestrPos(TidScan *node)
 	tidstate = node->tidstate;
 	tidstate->tss_TidPtr = tidstate->tss_MarkTidPtr;
 }
+#endif
 
 /* ----------------------------------------------------------------
  *		ExecInitTidScan
diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c
index 5711f70b690..f38251934c4 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.17 2000/04/12 17:15:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.18 2000/06/08 22:37:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -109,11 +109,13 @@ DLGetTailVal(Dllist *l)
 
 #endif
 
+#ifdef NOT_USED
 Dlelem *
 DLGetPred(Dlelem *e)			/* get predecessor */
 {
 	return e ? e->dle_prev : 0;
 }
+#endif
 
 Dlelem *
 DLGetSucc(Dlelem *e)			/* get successor */
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 870dcc04a13..1fcb40c929e 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.11 2000/01/26 05:56:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.12 2000/06/08 22:37:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -98,6 +98,7 @@ replace_opid(Oper *oper)
  *		constant (CONST, PARAM) nodes
  *****************************************************************************/
 
+#ifdef NOT_USED
 /*
  * non_null -
  *		Returns t if the node is a non-null constant, e.g., if the node has a
@@ -113,3 +114,5 @@ non_null(Expr *c)
 	else
 		return false;
 }
+#endif
+
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 62a5b0295c3..ba2e7e67b32 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.37 2000/05/31 15:38:53 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.38 2000/06/08 22:37:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,6 +40,9 @@ typedef struct RangeQueryClause
 
 static void addRangeClause(RangeQueryClause **rqlist, Node *clause,
 			   int flag, bool isLTsel, Selectivity s2);
+static Selectivity clause_selectivity(Query *root,
+				   Node *clause,
+				   int varRelid);
 
 
 /****************************************************************************
@@ -357,7 +360,7 @@ addRangeClause(RangeQueryClause **rqlist, Node *clause,
  * When varRelid is 0, all variables are treated as variables.	This
  * is appropriate for ordinary join clauses and restriction clauses.
  */
-Selectivity
+static Selectivity
 clause_selectivity(Query *root,
 				   Node *clause,
 				   int varRelid)
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 4109ab25364..3bbb03f878d 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.90 2000/05/23 16:56:36 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.91 2000/06/08 22:37:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,6 +74,7 @@ static Material *make_material(List *tlist, Oid nonameid, Plan *lefttree,
 			  int keycount);
 static void copy_path_costsize(Plan *dest, Path *src);
 static void copy_plan_costsize(Plan *dest, Plan *src);
+static SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid);
 
 /*
  * create_plan
@@ -1119,7 +1120,7 @@ make_noname(List *tlist,
 }
 
 
-SeqScan    *
+static SeqScan    *
 make_seqscan(List *qptlist,
 			 List *qpqual,
 			 Index scanrelid)
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index fed6f66f6a1..c13cc598485 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.25 2000/04/14 00:19:17 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.26 2000/06/08 22:37:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -223,6 +223,7 @@ cnfify(Expr *qual, bool removeAndFlag)
 	return (List *) newqual;
 }
 
+#ifdef NOT_USED
 /*
  * dnfify
  *	  Convert a qualification to disjunctive normal form by applying
@@ -233,7 +234,7 @@ cnfify(Expr *qual, bool removeAndFlag)
  * We do not offer a 'removeOrFlag' in this case; the usages are
  * different.
  */
-Expr *
+static Expr *
 dnfify(Expr *qual)
 {
 	Expr	   *newqual;
@@ -259,6 +260,7 @@ dnfify(Expr *qual)
 
 	return newqual;
 }
+#endif
 
 /*--------------------
  * The parser regards AND and OR as purely binary operators, so a qual like
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index d29fcc2f480..b4b4304a424 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.26 2000/02/06 03:27:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.27 2000/06/08 22:37:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 
 #include "optimizer/joininfo.h"
 
+static JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
 
 /*
  * joininfo_member
@@ -32,7 +33,7 @@
  * exists.
  *
  */
-JoinInfo   *
+static JoinInfo   *
 joininfo_member(List *join_relids, List *joininfo_list)
 {
 	List	   *i;
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 959cb8e2224..d55c5177089 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.45 2000/05/30 00:49:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.46 2000/06/08 22:37:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,8 @@
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
 
+static TargetEntry *tlistentry_member(Node *node, List *targetlist);
+
 /*****************************************************************************
  *	---------- RELATION node target list routines ----------
  *****************************************************************************/
@@ -27,7 +29,7 @@
  *	  Finds the (first) member of the given tlist whose expression is
  *	  equal() to the given expression.	Result is NULL if no such member.
  */
-TargetEntry *
+static TargetEntry *
 tlistentry_member(Node *node, List *targetlist)
 {
 	List	   *temp;
@@ -42,6 +44,7 @@ tlistentry_member(Node *node, List *targetlist)
 	return NULL;
 }
 
+#ifdef NOT_USED
 /*
  * matching_tlist_expr
  *	  Same as tlistentry_member(), except returns the tlist expression
@@ -58,6 +61,7 @@ matching_tlist_expr(Node *node, List *targetlist)
 
 	return (Node *) NULL;
 }
+#endif
 
 /*
  * tlist_member
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 8b39c3d6e96..34f67fb4a16 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.62 2000/05/30 00:49:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.63 2000/06/08 22:37:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@ static char *clauseText[] = {"ORDER BY", "GROUP BY", "DISTINCT ON"};
 static TargetEntry *findTargetlistEntry(ParseState *pstate, Node *node,
 					List *tlist, int clause);
 static void parseFromClause(ParseState *pstate, List *frmList);
-RangeTblEntry *transformTableEntry(ParseState *pstate, RangeVar *r);
+static RangeTblEntry *transformTableEntry(ParseState *pstate, RangeVar *r);
 static List *addTargetToSortList(TargetEntry *tle, List *sortlist,
 					List *targetlist, char *opname);
 static bool exprIsInSortList(Node *expr, List *sortList, List *targetList);
@@ -245,14 +245,12 @@ makeAttrList(Attr *attr)
 
 	return result;
 }
-
+#ifdef NOT_USED
 /* ExpandAttrs()
  * Take an existing attribute node and return a list of attribute nodes
  * with one attribute name per node.
  */
 List *
-			ExpandAttrs(Attr *attr);
-List *
 ExpandAttrs(Attr *attr)
 {
 	List	   *col;
@@ -273,6 +271,7 @@ ExpandAttrs(Attr *attr)
 
 	return rlist;
 }
+#endif
 
 /* transformUsingClause()
  * Take an ON or USING clause from a join expression and expand if necessary.
@@ -335,7 +334,7 @@ transformUsingClause(ParseState *pstate, List *usingList,
 #endif
 
 
-RangeTblEntry *
+static RangeTblEntry *
 transformTableEntry(ParseState *pstate, RangeVar *r)
 {
 	RelExpr    *baserel = r->relExpr;
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 9360c1486c2..c871222ab35 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.41 2000/06/03 04:41:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.42 2000/06/08 22:37:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,6 +65,7 @@ static char *attnum_type[SPECIALS] = {
 	"cid",
 };
 
+#ifdef NOT_USED
 /* refnameRangeTableEntries()
  * Given refname, return a list of range table entries
  * This is possible with JOIN syntax, where tables in a join
@@ -75,10 +76,8 @@ static char *attnum_type[SPECIALS] = {
  * to support outer joins in place yet.
  * - thomas 2000-03-04
  */
-List *
-			refnameRangeTableEntries(ParseState *pstate, char *refname);
 
-List *
+static List *
 refnameRangeTableEntries(ParseState *pstate, char *refname)
 {
 	List	   *rteList = NULL;
@@ -97,6 +96,7 @@ refnameRangeTableEntries(ParseState *pstate, char *refname)
 	}
 	return rteList;
 }
+#endif
 
 /* given refname, return a pointer to the range table entry */
 RangeTblEntry *
@@ -466,6 +466,7 @@ specialAttNum(char *a)
 }
 
 
+#ifdef NOT_USED
 /*
  * Given range variable, return whether attribute of this name
  * is a set.
@@ -491,7 +492,9 @@ attnameIsSet(Relation rd, char *name)
 	}
 	return get_attisset(RelationGetRelid(rd), name);
 }
+#endif
 
+#ifdef NOT_USED
 /*
  *	This should only be used if the relation is already
  *	heap_open()'ed.  Use the cache version
@@ -502,6 +505,7 @@ attnumAttNelems(Relation rd, int attid)
 {
 	return rd->rd_att->attrs[attid - 1]->attnelems;
 }
+#endif
 
 /* given attribute id, return type of that attribute */
 /*
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 69037338428..c582bd54abe 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.31 2000/06/06 16:50:37 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.32 2000/06/08 22:37:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -199,6 +199,7 @@ typeTypeRelid(Type typ)
 	return typtup->typrelid;
 }
 
+#ifdef NOT_USED
 Oid
 typeTypElem(Type typ)
 {
@@ -208,10 +209,11 @@ typeTypElem(Type typ)
 
 	return typtup->typelem;
 }
+#endif
 
+#ifdef NOT_USED
 /* Given the attribute type of an array return the attribute type of
    an element of the array */
-
 Oid
 GetArrayElementType(Oid typearray)
 {
@@ -237,7 +239,9 @@ GetArrayElementType(Oid typearray)
 
 	return type_struct_array->typelem;
 }
+#endif
 
+#ifdef NOT_USED
 /* Given a type structure, return the in-conversion function of the type */
 Oid
 typeInfunc(Type typ)
@@ -248,7 +252,9 @@ typeInfunc(Type typ)
 
 	return typtup->typinput;
 }
+#endif
 
+#ifdef NOT_USED
 /* Given a type structure, return the out-conversion function of the type */
 Oid
 typeOutfunc(Type typ)
@@ -259,3 +265,4 @@ typeOutfunc(Type typ)
 
 	return typtup->typoutput;
 }
+#endif
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index aa93a04b3c1..77b82b82c30 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.81 2000/05/19 03:22:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.82 2000/06/08 22:37:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,6 @@ static void WaitIO(BufferDesc *buf, SPINLOCK spinlock);
 static void StartBufferIO(BufferDesc *buf, bool forInput);
 static void TerminateBufferIO(BufferDesc *buf);
 static void ContinueBufferIO(BufferDesc *buf, bool forInput);
-extern void InitBufferIO(void);
 extern void AbortBufferIO(void);
 
 /*
@@ -2488,11 +2487,13 @@ ContinueBufferIO(BufferDesc *buf, bool forInput)
 	IsForInput = forInput;
 }
 
+#ifdef NOT_USED
 void
 InitBufferIO(void)
 {
 	InProgressBuf = (BufferDesc *) 0;
 }
+#endif
 
 /*
  *	This function is called from ProcReleaseSpins().
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index d62ed2670c8..844ba9b4e63 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.5 2000/04/12 17:15:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.6 2000/06/08 22:37:22 momjian Exp $
  *
  * NOTES:
  *
@@ -149,6 +149,7 @@ BufFileCreateTemp(void)
 	return file;
 }
 
+#ifdef NOT_USED
 /*
  * Create a BufFile and attach it to an already-opened virtual File.
  *
@@ -161,6 +162,7 @@ BufFileCreate(File file)
 {
 	return makeBufFile(file);
 }
+#endif
 
 /*
  * Close a BufFile
@@ -529,12 +531,14 @@ BufFileSeek(BufFile *file, int fileno, long offset, int whence)
 	return 0;
 }
 
+#ifdef NOT_USED
 void
 BufFileTell(BufFile *file, int *fileno, long *offset)
 {
 	*fileno = file->curFile;
 	*offset = file->curOffset + file->pos;
 }
+#endif
 
 /*
  * BufFileSeekBlock --- block-oriented seek
@@ -556,6 +560,7 @@ BufFileSeekBlock(BufFile *file, long blknum)
 					   SEEK_SET);
 }
 
+#ifdef NOT_USED
 /*
  * BufFileTellBlock --- block-oriented tell
  *
@@ -570,3 +575,5 @@ BufFileTellBlock(BufFile *file)
 	blknum += file->curFile * RELSEG_SIZE;
 	return blknum;
 }
+#endif
+
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 59f724f4b7a..f1b9f874666 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.40 2000/05/31 00:28:30 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.41 2000/06/08 22:37:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -227,6 +227,7 @@ XactLockTableInsert(TransactionId xid)
 		elog(ERROR, "XactLockTableInsert: LockAcquire failed");
 }
 
+#ifdef NOT_USED
 void
 XactLockTableDelete(TransactionId xid)
 {
@@ -242,6 +243,7 @@ XactLockTableDelete(TransactionId xid)
 
 	LockRelease(LockTableId, &tag, ExclusiveLock);
 }
+#endif
 
 void
 XactLockTableWait(TransactionId xid)
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 0595f38fe4b..0c1c4aa3382 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.158 2000/06/04 01:44:33 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.159 2000/06/08 22:37:26 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -136,6 +136,8 @@ static int	SocketBackend(StringInfo inBuf);
 static int	ReadCommand(StringInfo inBuf);
 static void pg_exec_query(char *query_string);
 static void SigHupHandler(SIGNAL_ARGS);
+static void FloatExceptionHandler(SIGNAL_ARGS);
+static void quickdie(SIGNAL_ARGS);
 
 /*
  * Flag to mark SIGHUP. Whenever the main loop comes around it
@@ -537,11 +539,13 @@ pg_exec_query(char *query_string)
 	pg_exec_query_dest(query_string, whereToSendOutput, FALSE);
 }
 
+#ifdef NOT_USED
 void
 pg_exec_query_acl_override(char *query_string)
 {
 	pg_exec_query_dest(query_string, whereToSendOutput, TRUE);
 }
+#endif
 
 void
 pg_exec_query_dest(char *query_string,	/* string to execute */
@@ -681,7 +685,7 @@ handle_warn(SIGNAL_ARGS)
 	siglongjmp(Warn_restart, 1);
 }
 
-void
+static void
 quickdie(SIGNAL_ARGS)
 {
 	PG_SETMASK(&BlockSig);
@@ -722,7 +726,7 @@ die(SIGNAL_ARGS)
 }
 
 /* signal handler for floating point exception */
-void
+static void
 FloatExceptionHandler(SIGNAL_ARGS)
 {
 	elog(ERROR, "floating point exception!"
@@ -752,7 +756,7 @@ CancelQuery(void)
 static void
 SigHupHandler(SIGNAL_ARGS)
 {
-    got_SIGHUP = true;
+	got_SIGHUP = true;
 }
 
 
@@ -1153,8 +1157,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (Show_query_stats &&
 		(Show_parser_stats || Show_planner_stats || Show_executor_stats))
 	{
-        elog(NOTICE, "Query statistics are disabled because parser, planner, or executor statistics are on.");
-        Show_query_stats = false;
+		elog(NOTICE, "Query statistics are disabled because parser, planner, or executor statistics are on.");
+		Show_query_stats = false;
 	}
 
 	if (!DataDir)
@@ -1379,7 +1383,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.158 $ $Date: 2000/06/04 01:44:33 $\n");
+		puts("$Revision: 1.159 $ $Date: 2000/06/08 22:37:26 $\n");
 	}
 
 	/*
@@ -1530,10 +1534,10 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 					DeferredTriggerEndQuery();
 
 					if (Show_query_stats)
-                    {
-                        fprintf(StatFp, "QUERY STATISTICS\n");
+					{
+						fprintf(StatFp, "QUERY STATISTICS\n");
 						ShowUsage();
-                    }
+					}
 				}
 				break;
 
@@ -1696,8 +1700,8 @@ ShowUsage(void)
 /*	   DisplayTupleCount(StatFp); */
 }
 
-#ifdef USE_ASSERT_CHECKING
-int
+#ifdef NOT_USED
+static int
 assertEnable(int val)
 {
 	assert_enabled = val;
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index aa45b0ed512..790c166ad4d 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.48 2000/05/29 19:16:57 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.49 2000/06/08 22:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,6 +31,17 @@
 #include "miscadmin.h"
 #include "utils/datetime.h"
 
+static int DecodeNumber(int flen, char *field,
+			 int fmask, int *tmask,
+			 struct tm * tm, double *fsec, int *is2digits);
+static int DecodeNumberField(int len, char *str,
+				  int fmask, int *tmask,
+				  struct tm * tm, double *fsec, int *is2digits);
+static int DecodeTime(char *str, int fmask, int *tmask,
+		   struct tm * tm, double *fsec);
+static int	DecodeTimezone(char *str, int *tzp);
+static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
+static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
 
 #define USE_DATE_CACHE 1
 #define ROUND_ALL 0
@@ -1155,12 +1166,11 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
 	return 0;
 }	/* DecodeTimeOnly() */
 
-
 /* DecodeDate()
  * Decode date string which includes delimiters.
  * Insist on a complete set of fields.
  */
-int
+static int
 DecodeDate(char *str, int fmask, int *tmask, struct tm * tm)
 {
 	double		fsec;
@@ -1288,7 +1298,7 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm * tm)
  * Only check the lower limit on hours, since this same code
  *	can be used to represent time spans.
  */
-int
+static int
 DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
 {
 	char	   *cp;
@@ -1341,7 +1351,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
 /* DecodeNumber()
  * Interpret numeric field as a date value in context.
  */
-int
+static int
 DecodeNumber(int flen, char *str, int fmask,
 			 int *tmask, struct tm * tm, double *fsec, int *is2digits)
 {
@@ -1445,7 +1455,7 @@ DecodeNumber(int flen, char *str, int fmask,
 /* DecodeNumberField()
  * Interpret numeric string as a concatenated date field.
  */
-int
+static int
 DecodeNumberField(int len, char *str, int fmask,
 				int *tmask, struct tm * tm, double *fsec, int *is2digits)
 {
@@ -1513,13 +1523,13 @@ DecodeNumberField(int len, char *str, int fmask,
 		return -1;
 
 	return 0;
-}	/* DecodeNumberField() */
+}	/*  DecodeNumberField() */
 
 
 /* DecodeTimezone()
  * Interpret string as a numeric timezone.
  */
-int
+static int
 DecodeTimezone(char *str, int *tzp)
 {
 	int			tz;
@@ -1908,7 +1918,7 @@ DecodeUnits(int field, char *lowtoken, int *val)
  * Binary search -- from Knuth (6.2.1) Algorithm B.  Special case like this
  * is WAY faster than the generic bsearch().
  */
-datetkn    *
+static datetkn    *
 datebsearch(char *key, datetkn *base, unsigned int nel)
 {
 	datetkn    *last = base + nel - 1,
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index b7b654cc320..93800b067d8 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.58 2000/06/05 07:28:51 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.59 2000/06/08 22:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -67,6 +67,8 @@
 #include "fmgr.h"
 #include "utils/builtins.h"
 
+static void CheckFloat8Val(double val);
+
 #ifndef NAN
 #define NAN		(0.0/0.0)
 #endif
@@ -154,7 +156,7 @@ CheckFloat4Val(double val)
 
    raise an elog warning if it is
 */
-void
+static void
 CheckFloat8Val(double val)
 {
 
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 24297b6845e..c2a9e2c7982 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.18 2000/05/30 00:49:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.19 2000/06/08 22:37:28 momjian Exp $
  *
  * NOTES
  *	  input routine largely stolen from boxin().
@@ -114,6 +114,7 @@ tideq(ItemPointer arg1, ItemPointer arg2)
 			arg1->ip_posid == arg2->ip_posid);
 }
 
+#ifdef NOT_USED
 bool
 tidne(ItemPointer arg1, ItemPointer arg2)
 {
@@ -123,7 +124,9 @@ tidne(ItemPointer arg1, ItemPointer arg2)
 			BlockIdGetBlockNumber(&(arg2->ip_blkid)) ||
 			arg1->ip_posid != arg2->ip_posid);
 }
+#endif
 
+#ifdef NOT_USED
 text *
 tid_text(ItemPointer tid)
 {
@@ -135,7 +138,9 @@ tid_text(ItemPointer tid)
 
 	return textin(str);
 }	/* tid_text() */
+#endif
 
+#ifdef NOT_USED
 ItemPointer
 text_tid(const text *string)
 {
@@ -151,7 +156,7 @@ text_tid(const text *string)
 
 	return result;
 }	/* text_tid() */
-
+#endif
 
 /*
  *	Functions to get latest tid of a specified tuple.
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 2bcb33cbcc2..a2d8faf05bf 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.27 2000/05/29 01:59:08 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.28 2000/06/08 22:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,6 +35,11 @@
 
 
 static double time2t(const int hour, const int min, const double sec);
+static int	EncodeSpecialTimestamp(Timestamp dt, char *str);
+static Timestamp dt2local(Timestamp dt, int timezone);
+static void dt2time(Timestamp dt, int *hour, int *min, double *sec);
+static int	interval2tm(Interval span, struct tm * tm, float8 *fsec);
+static int	tm2interval(struct tm * tm, double fsec, Interval *span);
 
 
 /*****************************************************************************
@@ -120,15 +125,9 @@ timestamp_out(Timestamp *dt)
 		return NULL;
 
 	if (TIMESTAMP_IS_RESERVED(*dt))
-	{
 		EncodeSpecialTimestamp(*dt, buf);
-
-	}
 	else if (timestamp2tm(*dt, &tz, tm, &fsec, &tzn) == 0)
-	{
 		EncodeDateTime(tm, fsec, &tz, &tzn, DateStyle, buf);
-
-	}
 	else
 		EncodeSpecialTimestamp(DT_INVALID, buf);
 
@@ -228,7 +227,7 @@ interval_out(Interval *span)
 /* EncodeSpecialTimestamp()
  * Convert reserved timestamp data type to string.
  */
-int
+static int
 EncodeSpecialTimestamp(Timestamp dt, char *str)
 {
 	if (TIMESTAMP_IS_RESERVED(dt))
@@ -266,7 +265,7 @@ now(void)
 	return result;
 }
 
-void
+static void
 dt2time(Timestamp jd, int *hour, int *min, double *sec)
 {
 	double		time;
@@ -434,7 +433,7 @@ tm2timestamp(struct tm * tm, double fsec, int *tzp, Timestamp *result)
 /* interval2tm()
  * Convert a interval data type to a tm structure.
  */
-int
+static int
 interval2tm(Interval span, struct tm * tm, float8 *fsec)
 {
 	double		time;
@@ -466,7 +465,7 @@ interval2tm(Interval span, struct tm * tm, float8 *fsec)
 	return 0;
 }	/* interval2tm() */
 
-int
+static int
 tm2interval(struct tm * tm, double fsec, Interval *span)
 {
 	span->month = ((tm->tm_year * 12) + tm->tm_mon);
@@ -485,7 +484,7 @@ time2t(const int hour, const int min, const double sec)
 	return (((hour * 60) + min) * 60) + sec;
 }	/* time2t() */
 
-Timestamp
+static Timestamp
 dt2local(Timestamp dt, int tz)
 {
 	dt -= tz;
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index d91f47b7ca2..19556fce66f 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.41 2000/04/12 17:15:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.42 2000/06/08 22:37:30 momjian Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -513,6 +513,7 @@ get_func_rettype(Oid funcid)
 
 /*				---------- RELATION CACHE ----------					 */
 
+#ifdef NOT_USED
 /*
  * get_relnatts -
  *
@@ -536,6 +537,7 @@ get_relnatts(Oid relid)
 	else
 		return InvalidAttrNumber;
 }
+#endif
 
 /*
  * get_rel_name -
diff --git a/src/backend/utils/init/findbe.c b/src/backend/utils/init/findbe.c
index 2bbc75c60f9..be9f2647d25 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.17 2000/01/26 05:57:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.18 2000/06/08 22:37:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,6 +32,8 @@
 #define S_IXOTH		 ((S_IXUSR)>>6)
 #endif
 
+static int	ValidateBinary(char *path);
+
 /*
  * ValidateBinary -- validate "path" as a POSTMASTER/POSTGRES executable file
  *
@@ -39,7 +41,7 @@
  *		  -1 if the regular file "path" does not exist or cannot be executed.
  *		  -2 if the file is otherwise valid but cannot be read.
  */
-int
+static int
 ValidateBinary(char *path)
 {
 	struct stat buf;
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 3f3d4b166d5..12facde811e 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.47 2000/06/02 15:57:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.48 2000/06/08 22:37:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,8 @@
 #include "miscadmin.h"
 #include "utils/syscache.h"
 
+static char *GetPidFname(void);
+
 
 #ifdef CYR_RECODE
 unsigned char RecodeForwTable[128];
@@ -406,7 +408,7 @@ SetPidFname(char *datadir)
 /*
  * Get path to the pid file
  */
-char *
+static char *
 GetPidFname(void)
 {
 	return (PidFile);