Make functions static or ifdef NOT_USED. Prevent pg_version creation.

2025-11-12 05:01:15 +03:00 · 1998-10-08 18:30:52 +00:00
parent 0a1c2805b3
commit 173c555948
52 changed files with 173 additions and 164 deletions
--- 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.44 1998/09/07 05:35:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.45 1998/10/08 18:29:10 momjian Exp $
 *
 * NOTES
 *	  The old interface functions have been converted to macros
@@ -274,6 +274,7 @@ heap_sysattrbyval(AttrNumber attno)
 	return byval;
 }

+#ifdef NOT_USED
 /* ----------------
 *		heap_getsysattr
 * ----------------
@@ -300,6 +301,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
 	}
 	return (Datum) NULL;
 }
+#endif

 /* ----------------
 *		nocachegetattr
--- 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.35 1998/09/01 04:26:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.36 1998/10/08 18:29:12 momjian Exp $
 *
 *
 * INTERFACE ROUTINES
@@ -96,6 +96,8 @@
 #include <string.h>
 #endif

+static void doinsert(Relation relation, HeapTuple tup);
+
 static bool ImmediateInvalidation;

 /* ----------------------------------------------------------------
@@ -475,7 +477,7 @@ heapgettup(Relation relation,
 	}
 }

-void
+static void
 doinsert(Relation relation, HeapTuple tup)
 {
 	RelationPutHeapTupleAtEnd(relation, tup);
--- 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.14 1998/09/01 03:21:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.15 1998/10/08 18:29:14 momjian Exp $
 *
 * NOTES
 *	  many of the old access method routines have been turned into
@@ -167,9 +167,6 @@ IndexScanRestart(IndexScanDesc scan,
 				scan->numberOfKeys * sizeof(ScanKeyData));
 }

-#endif
-
-#ifdef NOT_USED
 /* ----------------
 *	IndexScanEnd -- End and index scan.
 *
@@ -192,7 +189,6 @@ IndexScanEnd(IndexScanDesc scan)
 	pfree(scan);
 }

-#endif

 /* ----------------
 *	IndexScanMarkPosition -- Mark current position in a scan.
@@ -274,3 +270,5 @@ IndexScanRestorePosition(IndexScanDesc scan)

 	scan->flags = 0x0;			/* XXX should have a symbolic name */
 }
+#endif
+
--- 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.24 1998/10/06 02:39:58 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.25 1998/10/08 18:29:15 momjian Exp $
 *
 * NOTES
 *		Transaction aborts can now occur two ways:
@@ -262,7 +262,6 @@ SetTransactionFlushEnabled(bool state)
 	TransactionFlushState = (state == true);
 }

-#endif

 /* --------------------------------
 *		IsTransactionState
@@ -297,6 +296,7 @@ IsTransactionState(void)
 	 */
 	return false;
 }
+#endif

 /* --------------------------------
 *		IsAbortedTransactionBlockState
--- 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.17 1998/09/01 03:21:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.18 1998/10/08 18:29:18 momjian Exp $
 *
 * OLD COMMENTS
 * XXX WARNING
@@ -53,6 +53,7 @@ xidout(TransactionId transactionId)

 }

+#ifdef NOT_USED
 /* ----------------------------------------------------------------
 *		TransactionIdIsLessThan
 * ----------------------------------------------------------------
@@ -62,6 +63,7 @@ TransactionIdIsLessThan(TransactionId id1, TransactionId id2)
 {
 	return (bool) (id1 < id2);
 }
+#endif

 /* ----------------------------------------------------------------
 *		xideq
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for catalog
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.13 1998/08/25 04:19:14 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.14 1998/10/08 18:29:19 momjian Exp $
 #
 #-------------------------------------------------------------------------

@@ -31,7 +31,7 @@ GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \

 LOCALBKI_SRCS= $(addprefix ../../include/catalog/, \
                 pg_proc.h pg_type.h pg_attribute.h pg_class.h \
-                 pg_inherits.h pg_index.h pg_version.h pg_statistic.h \
+                 pg_inherits.h pg_index.h pg_statistic.h \
                 pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
                 pg_language.h pg_parg.h \
                 pg_aggregate.h pg_ipl.h pg_inheritproc.h \
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -2,7 +2,7 @@
 * Routines for handling of 'SET var TO',
 *	'SHOW var' and 'RESET var' statements.
 *
- * $Id: variable.c,v 1.13 1998/09/03 02:34:29 momjian Exp $
+ * $Id: variable.c,v 1.14 1998/10/08 18:29:20 momjian Exp $
 *
 */

@@ -19,6 +19,28 @@
 #include "mb/pg_wchar.h"
 #endif

+static bool show_date(void);
+static bool reset_date(void);
+static bool parse_date(const char *);
+static bool show_timezone(void);
+static bool reset_timezone(void);
+static bool parse_timezone(const char *);
+static bool show_cost_heap(void);
+static bool reset_cost_heap(void);
+static bool parse_cost_heap(const char *);
+static bool show_cost_index(void);
+static bool reset_cost_index(void);
+static bool parse_cost_index(const char *);
+static bool show_r_plans(void);
+static bool reset_r_plans();
+static bool parse_r_plans(const char *);
+static bool reset_geqo(void);
+static bool show_geqo(void);
+static bool parse_geqo(const char *);
+static bool show_ksqo(void);
+static bool reset_ksqo(void);
+static bool parse_ksqo(const char *);
+
 extern Cost _cpu_page_wight_;
 extern Cost _cpu_index_page_wight_;
 extern bool _use_geqo_;
@@ -128,7 +150,7 @@ get_token(char **tok, char **val, const char *str)
 }

 /*-----------------------------------------------------------------------*/
-bool
+static bool
 parse_geqo(const char *value)
 {
 	const char *rest;
@@ -175,7 +197,7 @@ parse_geqo(const char *value)
 	return TRUE;
 }

-bool
+static bool
 show_geqo()
 {

@@ -186,7 +208,7 @@ show_geqo()
 	return TRUE;
 }

-bool
+static bool
 reset_geqo(void)
 {

@@ -199,7 +221,7 @@ reset_geqo(void)
 	return TRUE;
 }

-bool
+static bool
 parse_r_plans(const char *value)
 {
 	if (value == NULL)
@@ -219,7 +241,7 @@ parse_r_plans(const char *value)
 }

 /*-----------------------------------------------------------------------*/
-bool
+static bool
 show_r_plans()
 {

@@ -230,7 +252,7 @@ show_r_plans()
 	return TRUE;
 }

-bool
+static bool
 reset_r_plans()
 {

@@ -243,7 +265,7 @@ reset_r_plans()
 }

 /*-----------------------------------------------------------------------*/
-bool
+static bool
 parse_cost_heap(const char *value)
 {
 	float32		res;
@@ -268,7 +290,7 @@ show_cost_heap()
 	return TRUE;
 }

-bool
+static bool
 reset_cost_heap()
 {
 	_cpu_page_wight_ = _CPU_PAGE_WEIGHT_;
@@ -276,7 +298,7 @@ reset_cost_heap()
 }

 /*-----------------------------------------------------------------------*/
-bool
+static bool
 parse_cost_index(const char *value)
 {
 	float32		res;
@@ -301,7 +323,7 @@ show_cost_index()
 	return TRUE;
 }

-bool
+static bool
 reset_cost_index()
 {
 	_cpu_index_page_wight_ = _CPU_INDEX_PAGE_WEIGHT_;
@@ -309,7 +331,7 @@ reset_cost_index()
 }

 /*-----------------------------------------------------------------------*/
-bool
+static bool
 parse_date(const char *value)
 {
 	char	   *tok;
@@ -379,7 +401,7 @@ parse_date(const char *value)
 	return TRUE;
 }

-bool
+static bool
 show_date()
 {
 	char		buf[64];
@@ -431,7 +453,7 @@ static char tzbuf[64];
 * Try to save existing TZ environment variable for later use in RESET TIME ZONE.
 * - thomas 1997-11-10
 */
-bool
+static bool
 parse_timezone(const char *value)
 {
 	char	   *tok;
@@ -468,7 +490,7 @@ parse_timezone(const char *value)
 	return TRUE;
 }	/* parse_timezone() */

-bool
+static bool
 show_timezone()
 {
 	char	   *tz;
@@ -625,7 +647,7 @@ indexes when multiple ORs are specified in the where clause.
 See optimizer/prep/prepkeyset.c for more on this.
 	daveh@insightdist.com    6/16/98
 -----------------------------------------------------------------------*/
-bool
+static bool
 parse_ksqo(const char *value)
 {
 	if (value == NULL)
@@ -644,7 +666,7 @@ parse_ksqo(const char *value)
 	return TRUE;
 }

-bool
+static bool
 show_ksqo()
 {

--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.20 1998/09/01 03:22:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.21 1998/10/08 18:29:26 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -446,7 +446,6 @@ ExecSlotPolicy(TupleTableSlot *slot)	/* slot to inspect */
 	return slot->ttc_shouldFree;
 }

-#endif

 /* --------------------------------
 *		ExecSetSlotPolicy
@@ -468,6 +467,7 @@ ExecSetSlotPolicy(TupleTableSlot *slot, /* slot to change */

 	return old_shouldFree;
 }
+#endif

 /* --------------------------------
 *		ExecSlotDescriptor
@@ -638,6 +638,7 @@ ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate)
 	commonscanstate->css_ScanTupleSlot = (TupleTableSlot *) slot;
 }

+#ifdef NOT_USED
 /* ----------------
 *		ExecInitMarkedTupleSlot
 * ----------------
@@ -649,6 +650,7 @@ ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate)
 	INIT_SLOT_ALLOC;
 	mergestate->mj_MarkedTupleSlot = (TupleTableSlot *) slot;
 }
+#endif

 /* ----------------
 *		ExecInitOuterTupleSlot
--- a/src/backend/executor/nodeTee.c
+++ b/src/backend/executor/nodeTee.c
@@ -15,7 +15,7 @@
 *		ExecEndTee
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.23 1998/09/01 04:28:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.24 1998/10/08 18:29:27 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -420,6 +420,7 @@ ExecTee(Tee *node, Plan *parent)
 	return result;
 }

+#ifdef NOT_USED
 /* ----------------------------------------------------------------
 *		ExecTeeReScan(node)
 *
@@ -462,6 +463,7 @@ ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent)
 		}
 	}
 }
+#endif


 /* ---------------------------------------------------------------------
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.27 1998/09/09 03:48:02 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.28 1998/10/08 18:29:29 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -46,6 +46,7 @@ static void replace_result_clause(Node *clause, List *subplanTargetList);
 static bool OperandIsInner(Node *opnd, int inner_relid);
 static List *replace_agg_clause(Node *expr, List *targetlist);
 static Node *del_agg_clause(Node *clause);
+static void set_result_tlist_references(Result *resultNode);

 /*****************************************************************************
 *
@@ -522,7 +523,7 @@ tlist_temp_references(Oid tempid,
 *	2) this routine will probably *NOT* work with nested dot
 *	   fields....
 */
-void
+static void
 set_result_tlist_references(Result *resultNode)
 {
 	Plan	   *subplan;
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.22 1998/09/23 04:22:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.23 1998/10/08 18:29:30 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -423,6 +423,7 @@ find_inheritance_children(Oid inhparent)
 	return list;
 }

+#ifdef NOT_USED
 /*
 * VersionGetParents--
 *
@@ -461,6 +462,8 @@ VersionGetParents(Oid verrelid)
 	heap_close(relation);
 	return list;
 }
+#endif
+

 /*****************************************************************************
 *
--- a/src/backend/parser/gram.c
+++ b/src/backend/parser/gram.c
@@ -229,7 +229,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.40 1998/10/03 05:40:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.41 1998/10/08 18:29:33 momjian Exp $
 *
 * HISTORY
 *	  AUTHOR			DATE			MAJOR EVENT
@@ -288,7 +288,7 @@ static char *xlateSqlFunc(char *);
 static char *xlateSqlType(char *);
 static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
 static Node *makeRowExpr(char *opr, List *largs, List *rargs);
-void mapTargetColumns(List *source, List *target);
+static void mapTargetColumns(List *source, List *target);
 static List *makeConstantList( A_Const *node);
 static char *FlattenStringList(List *list);
 static char *fmtId(char *rawid);
@@ -10636,7 +10636,7 @@ makeRowExpr(char *opr, List *largs, List *rargs)
 	return expr;
 }

-void
+static void
 mapTargetColumns(List *src, List *dst)
 {
 	ColumnDef *s;
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.34 1998/10/02 16:23:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.35 1998/10/08 18:29:41 momjian Exp $
 *
 * HISTORY
 *	  AUTHOR			DATE			MAJOR EVENT
@@ -69,7 +69,7 @@ static char *xlateSqlFunc(char *);
 static char *xlateSqlType(char *);
 static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
 static Node *makeRowExpr(char *opr, List *largs, List *rargs);
-void mapTargetColumns(List *source, List *target);
+static void mapTargetColumns(List *source, List *target);
 static List *makeConstantList( A_Const *node);
 static char *FlattenStringList(List *list);
 static char *fmtId(char *rawid);
@@ -4837,7 +4837,7 @@ makeRowExpr(char *opr, List *largs, List *rargs)
 	return expr;
 }

-void
+static void
 mapTargetColumns(List *src, List *dst)
 {
 	ColumnDef *s;
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.7 1998/10/01 22:45:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.8 1998/10/08 18:29:43 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -28,6 +28,8 @@
 Oid			DemoteType(Oid inType);
 Oid			PromoteTypeToNext(Oid inType);

+static Oid PreferredType(CATEGORY category, Oid type);
+

 /* coerce_type()
 * Convert a function argument to a different type.
@@ -347,7 +349,7 @@ IsPreferredType(CATEGORY category, Oid type)
 /* PreferredType()
 * Return the preferred type OID for the specified category.
 */
-Oid
+static Oid
 PreferredType(CATEGORY category, Oid type)
 {
 	Oid			result;
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.29 1998/09/25 13:36:04 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.30 1998/10/08 18:29:45 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -74,6 +74,8 @@ static int match_argtypes(int nargs,
 			   CandidateList *candidates);
 static List *setup_tlist(char *attname, Oid relid);
 static List *setup_base_tlist(Oid typeid);
+static Oid *func_select_candidate(int nargs, Oid *input_typeids,
+				CandidateList candidates);

 #define ISCOMPLEX(type) (typeidTypeRelid(type) ? true : false)

@@ -626,7 +628,7 @@ match_argtypes(int nargs,
 * But for now, return NULL and make the user give a better hint.
 * - thomas 1998-03-17
 */
-Oid *
+static Oid *
 func_select_candidate(int nargs,
 					  Oid *input_typeids,
 					  CandidateList candidates)
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.19 1998/09/25 13:36:07 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.20 1998/10/08 18:29:46 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -27,7 +27,8 @@
 #include "storage/bufmgr.h"
 #include "utils/syscache.h"

-Oid * oper_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates);
+static Oid * oper_select_candidate(int nargs, Oid *input_typeids,
+							CandidateList candidates);
 static int binary_oper_get_candidates(char *opname,
 						   Oid leftTypeId,
 						   Oid rightTypeId,
@@ -169,7 +170,7 @@ binary_oper_get_candidates(char *opname,
 * some sense. (see equivalentOpersAfterPromotion for details.)
 * - ay 6/95
 */
-Oid *
+static Oid *
 oper_select_candidate(int nargs,
 					  Oid *input_typeids,
 					  CandidateList candidates)
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.29 1998/09/25 13:36:08 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.30 1998/10/08 18:29:47 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -34,7 +34,7 @@
 static List *ExpandAllTables(ParseState *pstate);
 static char *FigureColname(Node *expr, Node *resval);

-Node *SizeTargetExpr(ParseState *pstate,
+static Node *SizeTargetExpr(ParseState *pstate,
 			   Node *expr,
 			   Oid attrtype,
 			   int32 attrtypmod);
@@ -664,7 +664,7 @@ CoerceTargetExpr(ParseState *pstate,
 * Apparently going to a fixed-length string?
 * Then explicitly size for storage...
 */
-Node *
+static Node *
 SizeTargetExpr(ParseState *pstate,
 			   Node *expr,
 			   Oid attrtype,
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.16 1998/09/01 04:30:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.17 1998/10/08 18:29:48 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -154,6 +154,7 @@ stringTypeString(Type tp, char *string, int32 atttypmod)
 }

 /* Given a type id, returns the out-conversion function of the type */
+#ifdef NOT_USED
 Oid
 typeidOutfunc(Oid type_id)
 {
@@ -171,6 +172,7 @@ typeidOutfunc(Oid type_id)
 	outfunc = type->typoutput;
 	return outfunc;
 }
+#endif

 Oid
 typeidTypeRelid(Oid type_id)
--- a/src/backend/parser/scan.c
+++ b/src/backend/parser/scan.c
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */

 /* Scanner skeleton version:
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.28 1998/09/15 02:25:09 scrappy Exp $
+ * /master/usr.bin/lex/skel.c,v 1.3 1997/09/25 00:10:23 jch Exp
 */

 #define FLEX_SCANNER
@@ -556,7 +556,7 @@ char *yytext;
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.28 1998/09/15 02:25:09 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.29 1998/10/08 18:29:49 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -592,7 +592,7 @@ static char *parseCh;
 /* MAX_PARSE_BUFFER is defined in miscadmin.h */
 #define YYLMAX MAX_PARSE_BUFFER
 #define YY_NO_UNPUT
-extern int myinput(char* buf, int max);
+static int myinput(char* buf, int max);
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) {result = myinput(buf,max);}
 #else
@@ -2259,7 +2259,7 @@ unput(char c)

 #ifdef FLEX_SCANNER
 /* input routine for flex to read input from a string instead of a file */
-int
+static int
 myinput(char* buf, int max)
 {
 	int len, copylen;
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.43 1998/09/01 03:24:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.44 1998/10/08 18:29:51 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -44,7 +44,7 @@ static char *parseCh;
 /* MAX_PARSE_BUFFER is defined in miscadmin.h */
 #define YYLMAX MAX_PARSE_BUFFER
 #define YY_NO_UNPUT
-extern int myinput(char* buf, int max);
+static int myinput(char* buf, int max);
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) {result = myinput(buf,max);}
 #else
@@ -479,7 +479,7 @@ unput(char c)

 #ifdef FLEX_SCANNER
 /* input routine for flex to read input from a string instead of a file */
-int
+static int
 myinput(char* buf, int max)
 {
 	int len, copylen;
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,7 +6,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.19 1998/10/02 16:27:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.20 1998/10/08 18:29:52 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -313,6 +313,7 @@ make_null(Oid type)
 	return (Node *) c;
 }

+#ifdef NOT_USED
 void
 FixResdomTypes(List *tlist)
 {
@@ -331,6 +332,7 @@ FixResdomTypes(List *tlist)
 		}
 	}
 }
+#endif

 static Node *
 FindMatchingNew(List *tlist, int attno)
@@ -793,6 +795,7 @@ nodeHandleViewRule(Node **nodePtr,
 	}
 }

+#ifdef NOT_USED
 void
 HandleViewRule(Query *parsetree,
 			   List *rtable,
@@ -814,3 +817,5 @@ HandleViewRule(Query *parsetree,
 	nodeHandleViewRule((Node **) (&(parsetree->groupClause)), rtable, targetlist, rt_index,
 					   modified, 0);
 }
+#endif
+
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.43 1998/09/01 04:31:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.44 1998/10/08 18:29:54 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -96,6 +96,7 @@ static BufferDesc *BufferAlloc(Relation reln, BlockNumber blockNum,
 static int	FlushBuffer(Buffer buffer, bool release);
 static void BufferSync(void);
 static int	BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld);
+static void PrintBufferDescs(void);

 /* not static but used by vacuum only ... */
 int			BlowawayRelationBuffers(Relation rel, BlockNumber block);
@@ -1263,6 +1264,7 @@ BufferGetBlockNumber(Buffer buffer)
 		return BufferDescriptors[buffer - 1].tag.blockNum;
 }

+#ifdef NOT_USED
 /*
 * BufferGetRelation --
 *		Returns the relation desciptor associated with a buffer.
@@ -1297,6 +1299,7 @@ BufferGetRelation(Buffer buffer)

 	return relation;
 }
+#endif

 /*
 * BufferReplace
@@ -1464,7 +1467,7 @@ DropBuffers(Oid dbid)
 *		use only.
 * -----------------------------------------------------------------
 */
-void
+static void
 PrintBufferDescs()
 {
 	int			i;
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.37 1998/09/09 18:32:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.38 1998/10/08 18:29:57 momjian Exp $
 *
 * NOTES
 *	  Outside modules can create a lock table and acquire/release
@@ -1712,6 +1712,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check)
 	return false;
 }

+#ifdef NOT_USED
 /*
 * Return an array with the pids of all processes owning a lock.
 * This works only for user locks because normal locks have no
@@ -1898,6 +1899,7 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)

 	return array;
 }
+#endif

 #ifdef DEADLOCK_DEBUG
 /*
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.25 1998/09/01 04:32:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.26 1998/10/08 18:29:59 momjian Exp $
 *
 * NOTES:
 *	 (1) The lock.c module assumes that the caller here is doing
@@ -194,6 +194,7 @@ MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode)
 	return MultiAcquire(MultiTableId, &tag, lockmode, RELN_LEVEL);
 }

+#ifdef NOT_USED
 /*
 * MultiLockTuple -- Lock the TID associated with a tuple
 *
@@ -220,6 +221,7 @@ MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
 	tag.tupleId = *tidPtr;
 	return MultiAcquire(MultiTableId, &tag, lockmode, TUPLE_LEVEL);
 }
+#endif

 /*
 * same as above at page level
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.20 1998/09/01 04:32:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.21 1998/10/08 18:30:03 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -72,12 +72,15 @@ static f_smgr smgrsw[] = {
 *	write-once storage managers.
 */

+#ifdef NOT_USED
 static bool smgrwo[] = {
 	false,						/* magnetic disk */
 #ifdef STABLE_MEMORY_STORAGE
 	false,						/* main memory */
 #endif
 };
+#endif
+
 static int	NSmgr = lengthof(smgrsw);

 /*
@@ -396,6 +399,7 @@ smgrabort()

 #endif

+#ifdef NOT_USED
 bool
 smgriswo(int16 smgrno)
 {
@@ -404,3 +408,4 @@ smgriswo(int16 smgrno)

 	return smgrwo[smgrno];
 }
+#endif
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.27 1998/09/01 04:32:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.28 1998/10/08 18:30:05 momjian Exp $
 *
 * NOTES
 *	 This code is actually (almost) unused.
@@ -941,6 +941,7 @@ intervalend(TimeInterval i)
 *	 PRIVATE ROUTINES														 *
 *****************************************************************************/

+#ifdef NOT_USED
 /*
 *		isreltime		- returns 1, iff datestring is of type reltime
 *								  2, iff datestring is 'invalid time' identifier
@@ -987,6 +988,7 @@ isreltime(char *str)

 	return 0;
 }	/* isreltime() */
+#endif

 #if FALSE
 int
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.58 1998/09/23 17:51:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.59 1998/10/08 18:30:07 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -46,6 +46,9 @@ static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
 static DateTime dt2local(DateTime dt, int timezone);
 static void dt2time(DateTime dt, int *hour, int *min, double *sec);
 static int	j2day(int jd);
+static double time2t(const int hour, const int min, const double sec);
+static int	timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec);
+static int	tm2timespan(struct tm * tm, double fsec, TimeSpan *span);

 #define USE_DATE_CACHE 1
 #define ROUND_ALL 0
@@ -2529,7 +2532,7 @@ tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *result)
 /* timespan2tm()
 * Convert a timespan data type to a tm structure.
 */
-int
+static int
 timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec)
 {
 	double		time;
@@ -2566,7 +2569,7 @@ timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec)
 	return 0;
 }	/* timespan2tm() */

-int
+static int
 tm2timespan(struct tm * tm, double fsec, TimeSpan *span)
 {
 	span->month = ((tm->tm_year * 12) + tm->tm_mon);
@@ -2590,7 +2593,7 @@ dt2local(DateTime dt, int tz)
 	return dt;
 }	/* dt2local() */

-double
+static double
 time2t(const int hour, const int min, const double sec)
 {
 	return (((hour * 60) + min) * 60) + sec;
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.45 1998/09/01 03:26:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.46 1998/10/08 18:30:09 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -361,6 +361,7 @@ AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2)
 	return time1 < time2;
 }

+#ifdef NOT_USED
 bool
 AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2)
 {
@@ -375,7 +376,7 @@ AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2)

 	return time1 > time2;
 }
-
+#endif

 /* abstime_finite()
 */
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,7 +11,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.15 1998/09/01 04:32:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.16 1998/10/08 18:30:11 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -155,11 +155,13 @@ namecat(Name n1, Name n2)

 #endif

+#ifdef NOT_USED
 int
 namecmp(Name n1, Name n2)
 {
 	return strncmp(n1->data, n2->data, NAMEDATALEN);
 }
+#endif

 int
 namestrcpy(Name name, char *str)
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.43 1998/09/02 23:37:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.44 1998/10/08 18:30:12 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -20,6 +20,9 @@

 #include "mb/pg_wchar.h"

+static int	text_cmp(text *arg1, text *arg2);
+
+
 /*****************************************************************************
 *	 USER I/O ROUTINES														 *
 *****************************************************************************/
@@ -515,6 +518,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
 	return result;
 }	/* varstr_cmp() */

+
 /* text_cmp()
 * Comparison function for text strings.
 * Includes locale support, but must copy strings to temporary memory
@@ -523,7 +527,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
 *	but it appears that most routines (incl. this one) assume not! - tgl 97/04/07
 * Returns -1, 0 or 1
 */
-int
+static int
 text_cmp(text *arg1, text *arg2)
 {
 	char	   *a1p,
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.20 1998/09/01 03:26:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.21 1998/10/08 18:30:14 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -47,8 +47,6 @@ static int	pronargs_save;
 static func_ptr user_fn_save = (func_ptr) NULL;
 static func_ptr handle_load(char *filename, char *funcname);

-func_ptr	trigger_dynamic(char *filename, char *funcname);
-
 func_ptr
 fmgr_dynamic(Oid procedureId, int *pronargs)
 {
@@ -279,6 +277,7 @@ load_file(char *filename)
 	handle_load(filename, (char *) NULL);
 }

+/* Is this used? bjm 1998/10/08 */
 func_ptr
 trigger_dynamic(char *filename, char *funcname)
 {
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.23 1998/10/05 02:48:49 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.24 1998/10/08 18:30:16 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -114,7 +114,6 @@ AbortPostgres()
 		proc_exit(FatalExitStatus);
 }

-#endif

 /* ----------------
 *		StatusBackendExit
@@ -138,6 +137,8 @@ StatusPostmasterExit(int status)
 	/* someday, do some real cleanup and then call the LISP exit */
 	proc_exit(status);
 }
+#endif
+

 /* ----------------------------------------------------------------
 *		processing mode support stuff (used to be in pmod.c)
@@ -145,6 +146,7 @@ StatusPostmasterExit(int status)
 */
 static ProcessingMode Mode = NoProcessing;

+#ifdef NOT_USED
 /*
 * IsNoProcessingMode --
 *		True iff processing mode is NoProcessing.
@@ -154,6 +156,7 @@ IsNoProcessingMode()
 {
 	return (bool) (Mode == NoProcessing);
 }
+#endif

 /*
 * IsBootstrapProcessingMode --