Make functions static where possible, enclose unused functions in #ifdef NOT_USED.

21 files changed, 198 insertions, 100 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 6c2f72c6838..71d76a6fc2f 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.18 1996/12/09 01:22:17 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.19 1997/08/19 21:28:49 momjian Exp $
  *
  * NOTES
  *    The old interface functions have been converted to macros
@@ -39,6 +39,8 @@
 #define register
 #endif /* !NO_ASSERT_CHECKING && sparc && sunos4 */
 
+static char *heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
+
 /* ----------------------------------------------------------------
  *			misc support routines
  * ----------------------------------------------------------------
@@ -335,7 +337,7 @@ heap_sysattrbyval(AttrNumber attno)
  *	heap_getsysattr
  * ----------------
  */
-char *
+static char *
 heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
 {
     switch (attnum) {
@@ -740,6 +742,7 @@ heap_copytuple(HeapTuple tuple)
     return(newTuple);
 }
 
+#ifdef NOT_USED
 /* ----------------
  *	heap_deformtuple
  *
@@ -772,6 +775,7 @@ heap_deformtuple(HeapTuple tuple,
 	    nulls[i] = ' ';
     }
 }
+#endif
 
 /* ----------------
  *	heap_formtuple 
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 80e7c71c098..a71fc46dc98 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.14 1997/06/12 15:41:52 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.15 1997/08/19 21:28:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,6 +27,8 @@
 #endif
 
 static Size IndexInfoFindDataOffset(unsigned short t_info);
+static char *fastgetiattr(IndexTuple tup, int attnum,
+	TupleDesc att, bool *isnull);
 
 /* ----------------------------------------------------------------
  *		  index_ tuple interface routines
@@ -125,7 +127,7 @@ index_formtuple(TupleDesc tupleDescriptor,
  *	the same attribute descriptor will go much quicker. -cim 5/4/91
  * ----------------
  */
-char *
+static char *
 fastgetiattr(IndexTuple tup,
 	     int attnum,
 	     TupleDesc tupleDesc,
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 15be274b001..1d36f340ed6 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -57,7 +57,9 @@ static OffsetNumber gistchoose(Relation r, Page p, IndexTuple it,
 static int gistnospace(Page p, IndexTuple it);
 void gistdelete(Relation r, ItemPointer tid);
 static IndexTuple gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t);
-
+static void gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
+			   Relation r, Page pg, OffsetNumber o, int b, bool l) ;
+static char *int_range_out(INTRANGE *r);
 
 /*
 ** routine to build an index.  Basically calls insert over and over
@@ -1172,7 +1174,7 @@ gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r,
 /*
 ** initialize a GiST entry with a compressed version of pred
 */
-void
+static void
 gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r, 
 	       Page pg, OffsetNumber o, int b, bool l) 
 { 
@@ -1244,7 +1246,8 @@ _gistdump(Relation r)
     }
 }
 
-char *text_range_out(TXTRANGE *r)
+#ifdef NOT_USED
+static char *text_range_out(TXTRANGE *r)
 {
     char	*result;
     char        *lower, *upper;
@@ -1266,8 +1269,9 @@ char *text_range_out(TXTRANGE *r)
     pfree(upper);
     return(result);
 }
+#endif
 
-char *
+static char *
 int_range_out(INTRANGE *r)
 {
     char	*result;
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 1b424f9d28f..ac1697e5ed2 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -34,6 +34,9 @@ static RetrieveIndexResult gistscancache(IndexScanDesc s, ScanDirection dir);
 static RetrieveIndexResult gistfirst(IndexScanDesc s, ScanDirection dir);
 static RetrieveIndexResult gistnext(IndexScanDesc s, ScanDirection dir);
 static ItemPointer gistheapptr(Relation r, ItemPointer itemp);
+static bool gistindex_keytest(IndexTuple tuple, TupleDesc tupdesc,
+		  int scanKeySize, ScanKey key, GISTSTATE *giststate,
+		  Relation r, Page p, OffsetNumber offset);
 
 
 RetrieveIndexResult
@@ -217,7 +220,7 @@ gistnext(IndexScanDesc s, ScanDirection dir)
 }
 
 /* Similar to index_keytest, but decompresses the key in the IndexTuple */
-bool
+static bool
 gistindex_keytest(IndexTuple tuple,
 		  TupleDesc tupdesc,
 		  int scanKeySize,
diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c
index fd9ab849cbe..8c78ccec3ae 100644
--- a/src/backend/access/gist/giststrat.c
+++ b/src/backend/access/gist/giststrat.c
@@ -102,6 +102,7 @@ RelationGetGISTStrategy(Relation r,
     return (RelationGetStrategy(r, attnum, &GISTEvaluationData, proc));
 }
 
+#ifdef NOT_USED
 bool
 RelationInvokeGISTStrategy(Relation r,
 			 AttrNumber attnum,
@@ -112,4 +113,4 @@ RelationInvokeGISTStrategy(Relation r,
     return (RelationInvokeStrategy(r, &GISTEvaluationData, attnum, s,
 				   left, right));
 }
-
+#endif
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index d7f60d28697..bf68ae02f66 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.7 1996/11/05 09:40:24 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.8 1997/08/19 21:29:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,6 +33,7 @@ static StrategyNumber	HTNegateCommute[1] = {
     InvalidStrategy
 };
 
+#ifdef NOT_USED
 static StrategyEvaluationData	HTEvaluationData = {
     /* XXX static for simplicity */
 
@@ -42,13 +43,15 @@ static StrategyEvaluationData	HTEvaluationData = {
     (StrategyTransformMap)HTNegateCommute,
     {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}
 };
+#endif
 
 /* ----------------------------------------------------------------
  *	RelationGetHashStrategy
  * ----------------------------------------------------------------
  */
 
-StrategyNumber
+#ifdef NOT_USED
+static StrategyNumber
 _hash_getstrat(Relation rel,
 	       AttrNumber attno,
 	       RegProcedure proc)
@@ -61,8 +64,10 @@ _hash_getstrat(Relation rel,
 
     return (strat);
 }
+#endif
 
-bool
+#ifdef NOT_USED
+static bool
 _hash_invokestrat(Relation rel,
 		  AttrNumber attno,
 		  StrategyNumber strat,
@@ -72,28 +77,4 @@ _hash_invokestrat(Relation rel,
     return (RelationInvokeStrategy(rel, &HTEvaluationData, attno, strat, 
 				   left, right));
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index e49c1edb4be..97d2c950b12 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.13 1997/08/12 22:51:40 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.14 1997/08/19 21:29:17 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -461,6 +461,7 @@ doinsert(Relation relation, HeapTuple tup)
  *	HeapScanIsValid is now a macro in relscan.h -cim 4/27/91
  */
 
+#ifdef NOT_USED
 /* ----------------
  *	SetHeapAccessMethodImmediateInvalidation
  * ----------------
@@ -470,6 +471,7 @@ SetHeapAccessMethodImmediateInvalidation(bool on)
 {
     ImmediateInvalidation = on;
 }
+#endif
 
 /* ----------------------------------------------------------------
  *                   heap access method interface
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index 913b09e6913..ae8273ac81c 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.10 1997/08/12 22:51:44 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.11 1997/08/19 21:29:21 momjian Exp $
  *
  * NOTES
  *    initam should be moved someplace else.
@@ -28,13 +28,15 @@
 # include <string.h>
 #endif
 
+static void InitHeapAccessStatistics(void);
+
 /* ----------------
  *      InitHeapAccessStatistics
  * ----------------
  */
 HeapAccessStatistics heap_access_stats = (HeapAccessStatistics) NULL;
      
-void
+static void
 InitHeapAccessStatistics()    
 {
     MemoryContext    oldContext;
@@ -121,6 +123,7 @@ InitHeapAccessStatistics()
     heap_access_stats = stats;
 }
 
+#ifdef NOT_USED
 /* ----------------
  *      ResetHeapAccessStatistics
  * ----------------
@@ -171,7 +174,9 @@ ResetHeapAccessStatistics()
     time(&stats->local_reset_timestamp);
     time(&stats->last_request_timestamp);
 }
+#endif
 
+#ifdef NOT_USED
 /* ----------------
  *      GetHeapAccessStatistics
  * ----------------
@@ -206,7 +211,9 @@ HeapAccessStatistics GetHeapAccessStatistics()
     
     return stats;
 }
+#endif
 
+#ifdef NOT_USED
 /* ----------------
  *      PrintHeapAccessStatistics
  * ----------------
@@ -302,7 +309,9 @@ PrintHeapAccessStatistics(HeapAccessStatistics stats)
     
     printf("\n");
 }
+#endif
 
+#ifdef NOT_USED
 /* ----------------
  *      PrintAndFreeHeapAccessStatistics
  * ----------------
@@ -314,6 +323,7 @@ PrintAndFreeHeapAccessStatistics(HeapAccessStatistics stats)
     if (stats != NULL)
 	pfree(stats);
 }
+#endif
 
 /* ----------------------------------------------------------------
  *		    access method initialization
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index d1bbbf63014..52b7b1473bf 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.6 1996/11/05 10:02:02 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.7 1997/08/19 21:29:26 momjian Exp $
  *
  * NOTES
  *    many of the old access method routines have been turned into
@@ -127,6 +127,7 @@ RelationGetIndexScan(Relation relation,
     return (scan);
 }
 
+#ifdef NOT_USED
 /* ----------------
  *  IndexScanRestart -- Restart an index scan.
  *
@@ -166,7 +167,9 @@ IndexScanRestart(IndexScanDesc scan,
 		key,
 		scan->numberOfKeys * sizeof(ScanKeyData));
 }
+#endif
 
+#ifdef NOT_USED
 /* ----------------
  *  IndexScanEnd -- End and index scan.
  *
@@ -188,6 +191,7 @@ IndexScanEnd(IndexScanDesc scan)
     
     pfree(scan);
 }
+#endif
 
 /* ----------------
  *  IndexScanMarkPosition -- Mark current position in a scan.
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 16f11ca07a4..5681e7be4f3 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.11 1997/08/12 22:51:48 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.12 1997/08/19 21:29:30 momjian Exp $
  *
  * INTERFACE ROUTINES
  *	index_open 	- open an index relation by relationId
@@ -271,6 +271,7 @@ index_endscan(IndexScanDesc scan)
     RelationUnsetRIntentLock(scan->relation);
 }
 
+#ifdef NOT_USED
 /* ----------------
  *	index_markpos  - mark a scan position
  * ----------------
@@ -285,7 +286,9 @@ index_markpos(IndexScanDesc scan)
     
     fmgr(procedure, scan);
 }
+#endif
 
+#ifdef NOT_USED
 /* ----------------
  *	index_restrpos  - restore a scan position
  * ----------------
@@ -300,6 +303,7 @@ index_restrpos(IndexScanDesc scan)
     
     fmgr(procedure, scan);
 }
+#endif
 
 /* ----------------
  *	index_getnext - get the next tuple from a scan
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 78faab96a55..d7acd9e0c4c 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.7 1996/11/05 10:02:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.8 1997/08/19 21:29:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,16 @@
 #include <access/istrat.h>
 #include <fmgr.h>
 
+static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation);
+static bool StrategyExpressionIsValid(StrategyExpression expression,
+				      StrategyNumber maxStrategy);
+static ScanKey StrategyMapGetScanKeyEntry(StrategyMap map,
+					  StrategyNumber strategyNumber);
+static bool StrategyOperatorIsValid(StrategyOperator operator,
+				    StrategyNumber maxStrategy);
+static bool StrategyTermIsValid(StrategyTerm term,
+				StrategyNumber maxStrategy);
+
 /* ----------------------------------------------------------------
  *	           misc strategy support routines
  * ----------------------------------------------------------------
@@ -50,7 +60,7 @@
  *	Assumes that the index strategy number is valid.
  *	Bounds checking should be done outside this routine.
  */
-ScanKey
+static ScanKey
 StrategyMapGetScanKeyEntry(StrategyMap map,
 			   StrategyNumber strategyNumber)
 {
@@ -103,7 +113,7 @@ AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
  *	StrategyOperatorIsValid
  * ----------------
  */
-bool
+static bool
 StrategyOperatorIsValid(StrategyOperator operator,
 			StrategyNumber maxStrategy)
 {
@@ -117,7 +127,7 @@ StrategyOperatorIsValid(StrategyOperator operator,
  *	StrategyTermIsValid
  * ----------------
  */
-bool
+static bool
 StrategyTermIsValid(StrategyTerm term,
 		    StrategyNumber maxStrategy)
 {
@@ -141,7 +151,7 @@ StrategyTermIsValid(StrategyTerm term,
  *	StrategyExpressionIsValid
  * ----------------
  */
-bool
+static bool
 StrategyExpressionIsValid(StrategyExpression expression,
 			  StrategyNumber maxStrategy)
 {
@@ -165,7 +175,7 @@ StrategyExpressionIsValid(StrategyExpression expression,
  *	StrategyEvaluationIsValid
  * ----------------
  */
-bool
+static bool
 StrategyEvaluationIsValid(StrategyEvaluation evaluation)
 {
     Index	index;
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 93b420fd771..9142c557378 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.8 1997/05/30 18:35:33 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.9 1997/08/19 21:29:36 momjian Exp $
  *
  *  NOTES
  *     Postgres btree pages look like ordinary relation pages.  The opaque
@@ -36,6 +36,9 @@
 # include <string.h>
 #endif
 
+static void _bt_setpagelock(Relation rel, BlockNumber blkno, int access);
+static void _bt_unsetpagelock(Relation rel, BlockNumber blkno, int access);
+
 #define BTREE_METAPAGE	0
 #define BTREE_MAGIC	0x053162
 
@@ -118,6 +121,7 @@ _bt_metapinit(Relation rel)
 	RelationUnsetLockForWrite(rel);
 }
 
+#ifdef NOT_USED
 /*
  *  _bt_checkmeta() -- Verify that the metadata stored in a btree are
  *		       reasonable.
@@ -157,6 +161,7 @@ _bt_checkmeta(Relation rel)
     
     _bt_relbuf(rel, metabuf, BT_READ);
 }
+#endif
 
 /*
  *  _bt_getroot() -- Get the root page of the btree.
@@ -537,7 +542,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, int access)
     }
 }
 
-void
+static void
 _bt_setpagelock(Relation rel, BlockNumber blkno, int access)
 {
     ItemPointerData iptr;
@@ -552,7 +557,7 @@ _bt_setpagelock(Relation rel, BlockNumber blkno, int access)
     }
 }
 
-void
+static void
 _bt_unsetpagelock(Relation rel, BlockNumber blkno, int access)
 {
     ItemPointerData iptr;
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index a0999d5d6ff..1d1c8072b93 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.22 1997/08/12 22:51:50 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.23 1997/08/19 21:29:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,7 @@ _bt_searchr(Relation rel, int keysz, ScanKey scankey,
 static OffsetNumber 
 _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, 
             Size keysz, ScanKey scankey, OffsetNumber offnum);
-int 
+static int 
 _bt_compare(Relation rel, TupleDesc itupdesc, Page page, 
             int keysz, ScanKey scankey, OffsetNumber offnum);
 static bool 
@@ -556,7 +556,7 @@ _bt_firsteq(Relation rel,
  *	but not "any time a new min key is inserted" (see _bt_insertonpg). 
  *		- vadim 12/05/96
  */
-int
+static int
 _bt_compare(Relation rel,
 	    TupleDesc itupdesc,
 	    Page page,
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 060bc996555..8e054d24abf 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *    $Id: nbtsort.c,v 1.18 1997/08/12 22:51:52 momjian Exp $
+ *    $Id: nbtsort.c,v 1.19 1997/08/19 21:29:46 momjian Exp $
  *
  * NOTES
  *
@@ -68,6 +68,11 @@
 extern int ShowExecutorStats;
 #endif
 
+static BTItem _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags);
+static BTItem _bt_minitem(Page opage, BlockNumber oblkno, int atend);
+static void *_bt_pagestate(Relation index, int flags, int level, bool doupper);
+static void _bt_uppershutdown(Relation index, BTPageState *state);
+
 /*
  * turn on debugging output.
  *
@@ -806,7 +811,7 @@ _bt_slideleft(Relation index, Buffer buf, Page page)
  * allocate and initialize a new BTPageState.  the returned structure
  * is suitable for immediate use by _bt_buildadd.
  */
-void *
+static void *
 _bt_pagestate(Relation index, int flags, int level, bool doupper)
 {
     BTPageState *state = (BTPageState *) palloc(sizeof(BTPageState));
@@ -829,7 +834,7 @@ _bt_pagestate(Relation index, int flags, int level, bool doupper)
  * the page to which the item used to point, e.g., a heap page if
  * 'opage' is a leaf page).
  */
-BTItem
+static BTItem
 _bt_minitem(Page opage, BlockNumber oblkno, int atend)
 {
     OffsetNumber off;
@@ -883,7 +888,7 @@ _bt_minitem(Page opage, BlockNumber oblkno, int atend)
  *
  * if all keys are unique, 'first' will always be the same as 'last'.
  */
-BTItem
+static BTItem
 _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
 {
     BTPageState *state = (BTPageState *) pstate;
@@ -1055,7 +1060,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
     return(last_bti);
 }
 
-void
+static void
 _bt_uppershutdown(Relation index, BTPageState *state)
 {
     BTPageState *s;
@@ -1311,6 +1316,7 @@ _bt_merge(Relation index, BTSpool *btspool)
  * which case we can just build the upper levels as we create the
  * sorted bottom level).  it is only used for index recycling.
  */
+#ifdef NOT_USED
 void
 _bt_upperbuild(Relation index)
 {
@@ -1370,6 +1376,7 @@ _bt_upperbuild(Relation index)
 	
     _bt_uppershutdown(index, state);
 }
+#endif
 
 /*
  * given a spool loading by successive calls to _bt_spool, create an
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index f74a476bab8..738e55dbccd 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.10 1997/04/16 01:48:29 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.11 1997/08/19 21:29:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -303,6 +303,7 @@ _bt_formitem(IndexTuple itup)
     return (btitem);
 }
 
+#ifdef NOT_USED
 bool
 _bt_checkqual(IndexScanDesc scan, IndexTuple itup)
 {
@@ -315,7 +316,9 @@ _bt_checkqual(IndexScanDesc scan, IndexTuple itup)
     else
 	return (true);
 }
+#endif
 
+#ifdef NOT_USED
 bool
 _bt_checkforkeys(IndexScanDesc scan, IndexTuple itup, Size keysz)
 {
@@ -328,6 +331,7 @@ _bt_checkforkeys(IndexScanDesc scan, IndexTuple itup, Size keysz)
     else
 	return (true);
 }
+#endif
 
 bool
 _bt_checkkeys (IndexScanDesc scan, IndexTuple tuple, Size *keysok)
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index 5e8750dbbce..7025a30999d 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.5 1996/11/05 10:54:20 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.6 1997/08/19 21:29:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,9 @@
 #include <access/rtree.h>
 #include <access/istrat.h>
 
+static StrategyNumber RelationGetRTStrategy(Relation r,
+			AttrNumber attnum, RegProcedure proc);
+
 /*
  *  Note:  negate, commute, and negatecommute all assume that operators are
  *	   ordered as follows in the strategy map:
@@ -200,7 +203,7 @@ static StrategyNumber RTOperMap[RTNStrategies] = {
     RTOverlapStrategyNumber
     };
 
-StrategyNumber
+static StrategyNumber
 RelationGetRTStrategy(Relation r,
 		      AttrNumber attnum,
 		      RegProcedure proc)
@@ -208,6 +211,7 @@ RelationGetRTStrategy(Relation r,
     return (RelationGetStrategy(r, attnum, &RTEvaluationData, proc));
 }
 
+#ifdef NOT_USED
 bool
 RelationInvokeRTStrategy(Relation r,
 			 AttrNumber attnum,
@@ -218,6 +222,7 @@ RelationInvokeRTStrategy(Relation r,
     return (RelationInvokeStrategy(r, &RTEvaluationData, attnum, s,
 				   left, right));
 }
+#endif
 
 RegProcedure
 RTMapOperator(Relation r,
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index bbd81858919..9087e50bc40 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.8 1996/11/27 15:15:54 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.9 1997/08/19 21:29:59 momjian Exp $
  *
  * NOTES
  *    This file contains the high level access-method interface to the
@@ -26,6 +26,12 @@
 #include <storage/spin.h>
 #include <commands/vacuum.h>
 
+static int RecoveryCheckingEnabled(void);
+static void TransRecover(Relation logRelation);
+static bool TransactionLogTest(TransactionId transactionId, XidStatus status);
+static void TransactionLogUpdate(TransactionId transactionId,
+				 XidStatus status);
+
 /* ----------------
  *    global variables holding pointers to relations used
  *    by the transaction system.  These are initialized by
@@ -95,17 +101,19 @@ extern bool	BuildingBtree;
  *	recovery checking accessors
  * ----------------
  */
-int
+static int
 RecoveryCheckingEnabled(void)
 {    
     return RecoveryCheckingEnableState;
 }
 
-void
+#ifdef NOT_USED
+static void
 SetRecoveryCheckingEnabled(bool state)
 {    
     RecoveryCheckingEnableState = (state == true);
 }
+#endif
 
 /* ----------------------------------------------------------------
  *	postgres log/time access method interface
@@ -124,7 +132,7 @@ SetRecoveryCheckingEnabled(bool state)
  * --------------------------------
  */
 
-bool	/* true/false: does transaction id have specified status? */
+static bool	/* true/false: does transaction id have specified status? */
 TransactionLogTest(TransactionId transactionId,	/* transaction id to test */
 		   XidStatus status)		/* transaction status */
 {
@@ -186,7 +194,7 @@ TransactionLogTest(TransactionId transactionId,	/* transaction id to test */
  *	TransactionLogUpdate
  * --------------------------------
  */
-void
+static void
 TransactionLogUpdate(TransactionId transactionId, /* trans id to update */
 		     XidStatus status) /* new trans status */
 {
@@ -371,7 +379,7 @@ TransactionIdGetCommitTime(TransactionId transactionId) /* transaction id to tes
  *      passed a flag on the command line.
  * --------------------------------
  */
-void
+static void
 TransRecover(Relation logRelation)
 {
 #if 0    
@@ -664,6 +672,7 @@ TransactionIdAbort(TransactionId transactionId)
     TransactionLogUpdate(transactionId, XID_ABORT);
 }
 
+#ifdef NOT_USED
 void
 TransactionIdSetInProgress(TransactionId transactionId)
 {
@@ -672,3 +681,4 @@ TransactionIdSetInProgress(TransactionId transactionId)
     
     TransactionLogUpdate(transactionId, XID_INPROGRESS);
 }
+#endif
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index 4eed0b87888..c3f1d4fc9fc 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.8 1997/08/12 22:51:57 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.9 1997/08/19 21:30:12 momjian Exp $
  *
  * NOTES
  *    This file contains support functions for the high
@@ -23,6 +23,15 @@
 #include <access/xact.h>
 #include <storage/lmgr.h>
 
+static AbsoluteTime TransBlockGetCommitTime(Block tblock,
+	TransactionId transactionId);
+static XidStatus TransBlockGetXidStatus(Block tblock,
+					TransactionId transactionId);
+static void TransBlockSetCommitTime(Block tblock,
+	TransactionId transactionId, AbsoluteTime commitTime);
+static void TransBlockSetXidStatus(Block tblock,
+	TransactionId transactionId, XidStatus xstatus);
+
 /* ----------------------------------------------------------------
  *		      general support routines
  * ----------------------------------------------------------------
@@ -93,7 +102,8 @@ TransComputeBlockNumber(Relation relation, /* relation to test */
  * --------------------------------
  */
 
-XidStatus
+#ifdef NOT_USED
+static XidStatus
 TransBlockGetLastTransactionIdStatus(Block tblock,
 				     TransactionId baseXid,
 				     TransactionId *returnXidP)
@@ -159,6 +169,7 @@ TransBlockGetLastTransactionIdStatus(Block tblock,
      */
     return xstatus;
 }
+#endif
 
 /* --------------------------------
  *	TransBlockGetXidStatus
@@ -167,7 +178,7 @@ TransBlockGetLastTransactionIdStatus(Block tblock,
  * --------------------------------
  */
 
-XidStatus
+static XidStatus
 TransBlockGetXidStatus(Block tblock,
 		       TransactionId transactionId)
 {
@@ -218,7 +229,7 @@ TransBlockGetXidStatus(Block tblock,
  *	This sets the status of the desired transaction
  * --------------------------------
  */
-void
+static void
 TransBlockSetXidStatus(Block tblock,
 		       TransactionId transactionId, 
 		       XidStatus xstatus)
@@ -279,7 +290,7 @@ TransBlockSetXidStatus(Block tblock,
  *	specified transaction id in the trans block.
  * --------------------------------
  */
-AbsoluteTime
+static AbsoluteTime
 TransBlockGetCommitTime(Block tblock,
 			TransactionId transactionId)
 {
@@ -320,7 +331,7 @@ TransBlockGetCommitTime(Block tblock,
  *	This sets the commit time of the specified transaction
  * --------------------------------
  */
-void
+static void
 TransBlockSetCommitTime(Block tblock,
 			TransactionId transactionId,
 			AbsoluteTime commitTime)
@@ -590,6 +601,7 @@ TransBlockNumberSetCommitTime(Relation relation,
  *	TransGetLastRecordedTransaction
  * --------------------------------
  */
+#ifdef NOT_USED
 void
 TransGetLastRecordedTransaction(Relation relation,
 				TransactionId xid, /* return: transaction id */
@@ -651,3 +663,4 @@ TransGetLastRecordedTransaction(Relation relation,
      */
     RelationUnsetLockForRead(relation);
 }
+#endif
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 2bf74210d4a..ba60ca35941 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.8 1997/08/12 22:51:58 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.9 1997/08/19 21:30:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,13 @@
 #include <access/heapam.h>
 #include <catalog/catname.h>
 
+static void GetNewObjectIdBlock(Oid *oid_return, int oid_block_size);
+static void VariableRelationGetNextOid(Oid *oid_return);
+static void VariableRelationGetNextXid(TransactionId *xidP);
+static void VariableRelationPutLastXid(TransactionId xid);
+static void VariableRelationPutNextOid(Oid *oidP);
+static void VariableRelationGetLastXid(TransactionId *xidP);
+
 /* ---------------------
  *	spin lock for oid generation
  * ---------------------
@@ -35,7 +42,7 @@ int OidGenLockId;
  *	VariableRelationGetNextXid
  * --------------------------------
  */
-void
+static void
 VariableRelationGetNextXid(TransactionId *xidP)
 {
     Buffer buf;
@@ -77,7 +84,7 @@ VariableRelationGetNextXid(TransactionId *xidP)
  *	VariableRelationGetLastXid
  * --------------------------------
  */
-void
+static void
 VariableRelationGetLastXid(TransactionId *xidP)
 {
     Buffer buf;
@@ -166,7 +173,7 @@ VariableRelationPutNextXid(TransactionId xid)
  *	VariableRelationPutLastXid
  * --------------------------------
  */
-void
+static void
 VariableRelationPutLastXid(TransactionId xid)
 {
     Buffer buf;
@@ -209,7 +216,7 @@ VariableRelationPutLastXid(TransactionId xid)
  *	VariableRelationGetNextOid
  * --------------------------------
  */
-void
+static void
 VariableRelationGetNextOid(Oid *oid_return)
 {
     Buffer buf;
@@ -277,7 +284,7 @@ VariableRelationGetNextOid(Oid *oid_return)
  *	VariableRelationPutNextOid
  * --------------------------------
  */
-void
+static void
 VariableRelationPutNextOid(Oid *oidP)
 {
     Buffer buf;
@@ -484,7 +491,7 @@ UpdateLastCommittedXid(TransactionId xid)
  *	id assignments should use this 
  * ----------------
  */
-void
+static void
 GetNewObjectIdBlock(Oid *oid_return, /* place to return the new object id */
 		    int oid_block_size)	/* number of oids desired */
 {
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 227c793a37e..903cca41130 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.11 1997/08/12 22:52:01 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.12 1997/08/19 21:30:19 momjian Exp $
  *	
  * NOTES
  *	Transaction aborts can now occur two ways:
@@ -151,6 +151,21 @@
 #include <commands/async.h>
 #include <commands/sequence.h>
 
+static void AbortTransaction(void);
+static void AtAbort_Cache(void);
+static void AtAbort_Locks(void);
+static void AtAbort_Memory(void);
+static void AtCommit_Cache(void);
+static void AtCommit_Locks(void);
+static void AtCommit_Memory(void);
+static void AtStart_Cache(void);
+static void AtStart_Locks(void);
+static void AtStart_Memory(void);
+static void CommitTransaction(void);
+static void RecordTransactionAbort(void);
+static void RecordTransactionCommit(void);
+static void StartTransaction(void);
+
 /* ----------------
  *	global variables holding the current transaction state.
  *
@@ -232,11 +247,13 @@ TransactionFlushEnabled(void)
     return TransactionFlushState;
 }
 
+#ifdef NOT_USED
 void
 SetTransactionFlushEnabled(bool state)
 {    
     TransactionFlushState = (state == true);
 }
+#endif
 
 /* --------------------------------
  *	IsTransactionState
@@ -420,12 +437,13 @@ CommandIdIsCurrentCommandId(CommandId cid)
  *	ClearCommandIdCounterOverflowFlag
  * --------------------------------
  */
+#ifdef NOT_USED
 void
 ClearCommandIdCounterOverflowFlag()
 {
     CommandIdCounterOverflowFlag = false;
 }
-
+#endif
 
 /* --------------------------------
  *	CommandCounterIncrement
@@ -464,7 +482,7 @@ InitializeTransactionSystem()
  *	AtStart_Cache
  * --------------------------------
  */
-void
+static void
 AtStart_Cache()    
 {
     DiscardInvalid();
@@ -474,7 +492,7 @@ AtStart_Cache()
  *	AtStart_Locks
  * --------------------------------
  */
-void
+static void
 AtStart_Locks()    
 {
     /*
@@ -489,7 +507,7 @@ AtStart_Locks()
  *	AtStart_Memory
  * --------------------------------
  */
-void
+static void
 AtStart_Memory()    
 {
     Portal	     portal;
@@ -526,7 +544,7 @@ AtStart_Memory()
  *	      -cim 3/18/90
  * --------------------------------
  */
-void
+static void
 RecordTransactionCommit()    
 {
     TransactionId xid;
@@ -569,7 +587,7 @@ RecordTransactionCommit()
  *	AtCommit_Cache
  * --------------------------------
  */
-void
+static void
 AtCommit_Cache()
 {
     /* ----------------
@@ -586,7 +604,7 @@ AtCommit_Cache()
  *	AtCommit_Locks
  * --------------------------------
  */
-void
+static void
 AtCommit_Locks()  
 {
     /* ----------------
@@ -602,7 +620,7 @@ AtCommit_Locks()
  *	AtCommit_Memory
  * --------------------------------
  */
-void
+static void
 AtCommit_Memory()  
 {
     /* ----------------
@@ -624,7 +642,7 @@ AtCommit_Memory()
  *	RecordTransactionAbort
  * --------------------------------
  */
-void
+static void
 RecordTransactionAbort()    
 {
     TransactionId xid;
@@ -655,7 +673,7 @@ RecordTransactionAbort()
  *	AtAbort_Cache
  * --------------------------------
  */
-void
+static void
 AtAbort_Cache()    
 {
     RegisterInvalid(false);
@@ -665,7 +683,7 @@ AtAbort_Cache()
  *	AtAbort_Locks
  * --------------------------------
  */
-void
+static void
 AtAbort_Locks()    
 {
     /* ----------------
@@ -682,7 +700,7 @@ AtAbort_Locks()
  *	AtAbort_Memory
  * --------------------------------
  */
-void
+static void
 AtAbort_Memory()    
 {
     /* ----------------
@@ -704,7 +722,7 @@ AtAbort_Memory()
  *
  * --------------------------------
  */
-void
+static void
 StartTransaction()
 {
     TransactionState s = CurrentTransactionState;
@@ -788,7 +806,7 @@ CurrentXactInProgress()
  *
  * --------------------------------
  */
-void
+static void
 CommitTransaction()
 {
     TransactionState s = CurrentTransactionState;
@@ -847,7 +865,7 @@ CommitTransaction()
  *
  * --------------------------------
  */
-void
+static void
 AbortTransaction()
 {
     TransactionState s = CurrentTransactionState;
@@ -1245,7 +1263,8 @@ EndTransactionBlock(void)
  *	AbortTransactionBlock
  * --------------------------------
  */
-void
+#ifdef NOT_USED
+static void
 AbortTransactionBlock(void)
 {
     TransactionState s = CurrentTransactionState;
@@ -1288,6 +1307,7 @@ AbortTransactionBlock(void)
     AbortTransaction();
     s->blockState = TBLOCK_ENDABORT;
 }
+#endif
 
 /* --------------------------------
  *	UserAbortTransactionBlock
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index db3dd1b8c36..16e55e26411 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.6 1997/08/12 22:52:02 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.7 1997/08/19 21:30:20 momjian Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -132,6 +132,7 @@ xideq(TransactionId xid1, TransactionId xid2)
  *	TransactionIdIncrement
  * ----------------------------------------------------------------
  */
+#ifdef NOT_USED
 void
 TransactionIdIncrement(TransactionId *transactionId)
 {
@@ -141,6 +142,7 @@ TransactionIdIncrement(TransactionId *transactionId)
 	elog(FATAL, "TransactionIdIncrement: exhausted XID's");
     return;
 }
+#endif
 
 /* ----------------------------------------------------------------
  *	TransactionIdAdd