From 278bbf4572996e4097eac0c0d169dea1616ad0b6 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 26 May 1999 12:57:23 +0000
Subject: [PATCH] Make functions static or NOT_USED as appropriate.

---
 src/backend/access/common/Makefile    |  4 ++--
 src/backend/access/common/heapvalid.c | 34 ----------------------------------
 src/backend/commands/copy.c           | 34 +++++++++++++++++-----------------
 src/backend/lib/stringinfo.c          |  4 +++-
 src/backend/libpq/auth.c              |  5 +++--
 src/backend/nodes/freefuncs.c         |  5 +++--
 src/backend/optimizer/path/joinrels.c |  9 ++++++---
 src/backend/optimizer/plan/setrefs.c  |  7 +++++--
 src/backend/parser/parse_clause.c     | 18 ++++++++++--------
 src/backend/parser/parse_expr.c       |  5 +++--
 src/backend/rewrite/rewriteHandler.c  | 23 ++++++++++++++---------
 src/backend/rewrite/rewriteManip.c    |  4 +++-
 src/backend/storage/file/fd.c         |  5 +++--
 src/backend/tcop/postgres.c           |  7 ++++---
 src/backend/utils/adt/oracle_compat.c |  5 +++--
 src/backend/utils/misc/trace.c        |  6 +++++-
 src/backend/utils/mmgr/oset.c         |  4 +++-
 src/bin/pg_passwd/pg_passwd.c         | 31 ++++++++++++++++---------------
 src/include/access/valid.h            |  4 +---
 src/include/lib/stringinfo.h          |  4 +++-
 src/include/libpq/auth.h              |  3 +--
 src/include/nodes/nodes.h             |  7 +------
 src/include/optimizer/paths.h         |  4 +---
 src/include/optimizer/planmain.h      |  5 +----
 src/include/parser/parse_clause.h     |  4 +---
 src/include/parser/parse_expr.h       |  3 +--
 src/include/rewrite/rewriteHandler.h  |  7 +------
 src/include/rewrite/rewriteManip.h    |  3 +--
 src/include/storage/fd.h              |  3 +--
 src/include/tcop/tcopprot.h           |  3 +--
 src/include/utils/builtins.h          |  3 +--
 src/include/utils/memutils.h          |  3 +--
 src/include/utils/trace.h             |  3 ---
 src/pl/tcl/pltcl.c                    |  7 ++++---
 34 files changed, 123 insertions(+), 153 deletions(-)
 delete mode 100644 src/backend/access/common/heapvalid.c

diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile
index 5b188808e8..00e2562ea4 100644
--- a/src/backend/access/common/Makefile
+++ b/src/backend/access/common/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/common
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.12 1998/07/26 04:30:16 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.13 1999/05/26 12:55:05 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ ifdef MULTIBYTE
 CFLAGS+= $(MBFLAGS)
 endif
 
-OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \
+OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \
        scankey.o tupdesc.o  
 
 all: SUBSYS.o
diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
deleted file mode 100644
index d716e77f4f..0000000000
--- a/src/backend/access/common/heapvalid.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * heapvalid.c
- *	  heap tuple qualification validity checking code
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.23 1999/02/13 23:14:11 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-
-#include <postgres.h>
-
-#include <access/valid.h>
-#include <access/xact.h>
-
-/*
- *	TupleUpdatedByCurXactAndCmd() -- Returns true if this tuple has
- *		already been updated once by the current transaction/command
- *		pair.
- */
-bool
-TupleUpdatedByCurXactAndCmd(HeapTuple t)
-{
-	if (TransactionIdEquals(t->t_data->t_xmax,
-							GetCurrentTransactionId()) &&
-		CommandIdGEScanCommandId(t->t_data->t_cmax))
-		return true;
-
-	return false;
-}
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index d2b98ec4bc..f6ac370938 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.77 1999/05/25 16:08:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.78 1999/05/26 12:55:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,14 +73,14 @@ static int	lineno;
 /*
  * Internal communications functions
  */
-inline void CopySendData(void *databuf, int datasize, FILE *fp);
-inline void CopySendString(char *str, FILE *fp);
-inline void CopySendChar(char c, FILE *fp);
-inline void CopyGetData(void *databuf, int datasize, FILE *fp);
-inline int	CopyGetChar(FILE *fp);
-inline int	CopyGetEof(FILE *fp);
-inline int	CopyPeekChar(FILE *fp);
-inline void CopyDonePeek(FILE *fp, int c, int pickup);
+static void CopySendData(void *databuf, int datasize, FILE *fp);
+static void CopySendString(char *str, FILE *fp);
+static void CopySendChar(char c, FILE *fp);
+static void CopyGetData(void *databuf, int datasize, FILE *fp);
+static int	CopyGetChar(FILE *fp);
+static int	CopyGetEof(FILE *fp);
+static int	CopyPeekChar(FILE *fp);
+static void CopyDonePeek(FILE *fp, int c, int pickup);
 
 /*
  * CopySendData sends output data either to the file
@@ -92,7 +92,7 @@ inline void CopyDonePeek(FILE *fp, int c, int pickup);
  *
  * NB: no data conversion is applied by these functions
  */
-inline void
+static void
 CopySendData(void *databuf, int datasize, FILE *fp)
 {
 	if (!fp)
@@ -101,13 +101,13 @@ CopySendData(void *databuf, int datasize, FILE *fp)
 		fwrite(databuf, datasize, 1, fp);
 }
 
-inline void
+static void
 CopySendString(char *str, FILE *fp)
 {
 	CopySendData(str, strlen(str), fp);
 }
 
-inline void
+static void
 CopySendChar(char c, FILE *fp)
 {
 	CopySendData(&c, 1, fp);
@@ -123,7 +123,7 @@ CopySendChar(char c, FILE *fp)
  *
  * NB: no data conversion is applied by these functions
  */
-inline void
+static void
 CopyGetData(void *databuf, int datasize, FILE *fp)
 {
 	if (!fp)
@@ -132,7 +132,7 @@ CopyGetData(void *databuf, int datasize, FILE *fp)
 		fread(databuf, datasize, 1, fp);
 }
 
-inline int
+static int
 CopyGetChar(FILE *fp)
 {
 	if (!fp)
@@ -147,7 +147,7 @@ CopyGetChar(FILE *fp)
 		return getc(fp);
 }
 
-inline int
+static int
 CopyGetEof(FILE *fp)
 {
 	if (!fp)
@@ -164,7 +164,7 @@ CopyGetEof(FILE *fp)
  * CopyDonePeek will either take the peeked char off the steam
  * (if pickup is != 0) or leave it on the stream (if pickup == 0)
  */
-inline int
+static int
 CopyPeekChar(FILE *fp)
 {
 	if (!fp)
@@ -173,7 +173,7 @@ CopyPeekChar(FILE *fp)
 		return getc(fp);
 }
 
-inline void
+static void
 CopyDonePeek(FILE *fp, int c, int pickup)
 {
 	if (!fp)
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
index 12d0f8625c..d5e44ba0f1 100644
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: stringinfo.c,v 1.16 1999/05/25 16:08:53 momjian Exp $
+ *	  $Id: stringinfo.c,v 1.17 1999/05/26 12:55:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,7 @@
 #include "postgres.h"
 #include "lib/stringinfo.h"
 
+#ifdef NOT_USED
 /*
  * makeStringInfo
  *
@@ -37,6 +38,7 @@ makeStringInfo(void)
 
 	return res;
 }
+#endif
 
 /*
  * initStringInfo
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index c5bfc69748..565060905a 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.36 1999/05/25 16:08:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.37 1999/05/26 12:55:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,6 +50,7 @@ static int	pg_passwordv0_recvauth(void *arg, PacketLen len, void *pkt);
 static int	checkPassword(Port *port, char *user, char *password);
 static int	old_be_recvauth(Port *port);
 static int	map_old_to_new(Port *port, UserAuth old, int status);
+static void	auth_failed(Port *port);
 
 
 #ifdef KRB4
@@ -402,7 +403,7 @@ pg_passwordv0_recvauth(void *arg, PacketLen len, void *pkt)
  * postmaster log, which we hope is only readable by good guys.
  */
 
-void
+static void
 auth_failed(Port *port)
 {
 	char		buffer[512];
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 50c8bd9f48..0fa1906c96 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.18 1999/05/25 22:41:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.19 1999/05/26 12:55:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,6 +35,7 @@
  *					 plannodes.h free functions
  * ****************************************************************
  */
+static void freeObject(void *obj);
 
 /* ----------------
  *		FreePlanFields
@@ -1157,7 +1158,7 @@ _freeValue(Value *node)
  *		recursively frees its items.
  * ----------------
  */
-void
+static void
 freeObject(void *node)
 {
 	if (node == NULL)
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 1a2c897502..3c6c2888ff 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.34 1999/05/25 22:41:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.35 1999/05/26 12:55:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,6 +28,9 @@ static bool nonoverlap_sets(List *s1, List *s2);
 static bool is_subset(List *s1, List *s2);
 static void set_joinrel_size(RelOptInfo *joinrel, RelOptInfo *outer_rel,
 				 RelOptInfo *inner_rel, JoinInfo *jinfo);
+static RelOptInfo *make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel,
+								 JoinInfo *joininfo);
+static List *new_join_tlist(List *tlist, int first_resdomno);
 
 /*
  * make_rels_by_joins
@@ -191,7 +194,7 @@ make_rels_by_clauseless_joins(RelOptInfo *old_rel, List *inner_rels)
  *
  * Returns the new join relation node.
  */
-RelOptInfo *
+static RelOptInfo *
 make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo)
 {
 	RelOptInfo *joinrel = makeNode(RelOptInfo);
@@ -265,7 +268,7 @@ make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo)
  *
  * Returns the new target list.
  */
-List *
+static List *
 new_join_tlist(List *tlist,
 			   int first_resdomno)
 {
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 2e433c4d41..4cb945b5f6 100644
--- 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.48 1999/05/25 22:41:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.49 1999/05/26 12:55:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,6 +47,9 @@ static bool OperandIsInner(Node *opnd, int inner_relid);
 static List *pull_agg_clause(Node *clause);
 static Node *del_agg_clause(Node *clause);
 static void set_result_tlist_references(Result *resultNode);
+static void replace_vars_with_subplan_refs(Node *clause,
+							   Index subvarno,
+							   List *subplanTargetList);
 
 /*****************************************************************************
  *
@@ -603,7 +606,7 @@ replace_tlist_with_subplan_refs(List *tlist,
  * Afterwards, all Var nodes have varno = subvarno, varattno = resno
  * of corresponding subplan target.
  */
-void
+static void
 replace_vars_with_subplan_refs(Node *clause,
 							   Index subvarno,
 							   List *subplanTargetList)
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 618554e561..c91c9e9afb 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.36 1999/05/25 16:10:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.37 1999/05/26 12:55:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,14 +41,12 @@ static TargetEntry *
 
 static void parseFromClause(ParseState *pstate, List *frmList, Node **qual);
 
-Attr	   *makeAttr(char *relname, char *attname);
-
 #ifdef ENABLE_OUTER_JOINS
 Node	   *transformUsingClause(ParseState *pstate, List *onList, char *lname, char *rname);
 
 #endif
 
-char	   *transformTableEntry(ParseState *pstate, RangeVar *r);
+static char	*transformTableEntry(ParseState *pstate, RangeVar *r);
 
 
 /*
@@ -126,7 +124,8 @@ transformWhereClause(ParseState *pstate, Node *a_expr, Node *o_expr)
 	return qual;
 }
 
-Attr *
+#ifdef NOT_USED
+static Attr *
 makeAttr(char *relname, char *attname)
 {
 	Attr	   *a = makeNode(Attr);
@@ -138,6 +137,7 @@ makeAttr(char *relname, char *attname)
 
 	return a;
 }
+#endif
 
 #ifdef ENABLE_OUTER_JOINS
 /* transformUsingClause()
@@ -206,7 +206,7 @@ transformUsingClause(ParseState *pstate, List *onList, char *lname, char *rname)
 
 #endif
 
-char *
+static char *
 transformTableEntry(ParseState *pstate, RangeVar *r)
 {
 	RelExpr    *baserel = r->relExpr;
@@ -744,7 +744,8 @@ transformSortClause(ParseState *pstate,
  * Let's just try matching in pairs for now (right to left) and see if it works.
  * - thomas 1998-05-22
  */
-List *
+#ifdef NOT_USED
+static List *
 transformUnionClause(List *unionClause, List *targetlist)
 {
 	List	   *union_list = NIL;
@@ -832,4 +833,5 @@ transformUnionClause(List *unionClause, List *targetlist)
 	}
 	else
 		return NIL;
-}	/* transformUnionClause() */
+}
+#endif
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 8ea98d2809..48c6f9f960 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.48 1999/05/25 16:10:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.49 1999/05/26 12:55:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,6 +33,7 @@
 #include "utils/builtins.h"
 
 static Node *parser_typecast(Value *expr, TypeName *typename, int32 atttypmod);
+static Node *transformIdent(ParseState *pstate, Node *expr, int precedence);
 
 /*
  * transformExpr -
@@ -534,7 +535,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
 	return result;
 }
 
-Node *
+static Node *
 transformIdent(ParseState *pstate, Node *expr, int precedence)
 {
 	Ident	   *ident = (Ident *) expr;
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index ed02edddea..37cd175ef5 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.45 1999/05/25 16:10:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.46 1999/05/26 12:55:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,7 +61,12 @@ static SubLink *modifyAggrefMakeSublink(Expr *origexp, Query *parsetree);
 static void modifyAggrefQual(Node **nodePtr, Query *parsetree);
 static bool checkQueryHasAggs(Node *node);
 static Query *fireRIRrules(Query *parsetree);
-
+static Query *Except_Intersect_Rewrite(Query *parsetree);
+static void check_targetlists_are_compatible(List *prev_target,
+											 List *current_target);
+static void create_intersect_list(Node *ptr, List **intersect_list);
+static Node *intersect_tree_analyze(Node *tree, Node *first_select,
+									Node *parsetree);
 
 /*
  * gatherRewriteMeta -
@@ -2934,7 +2939,7 @@ QueryRewrite(Query *parsetree)
 /* This function takes two targetlists as arguments and checks if the
  * targetlists are compatible (i.e. both select for the same number of
  * attributes and the types are compatible */
-void
+static void
 check_targetlists_are_compatible(List *prev_target, List *current_target)
 {
 	List	   *tl,
@@ -3026,7 +3031,7 @@ check_targetlists_are_compatible(List *prev_target, List *current_target)
  * new top Node can differ from the parsetree given as argument because of
  * the translation to DNF. That's why we have to remember the sortClause or
  * unique flag!) */
-Query *
+static Query *
 Except_Intersect_Rewrite(Query *parsetree)
 {
 
@@ -3153,7 +3158,7 @@ Except_Intersect_Rewrite(Query *parsetree)
 		 * returned
 		 */
 		intersect_list = NIL;
-		create_list((Node *) lfirst(intersect), &intersect_list);
+		create_intersect_list((Node *) lfirst(intersect), &intersect_list);
 
 		/*
 		 * This one will become the Select Query node, all other nodes are
@@ -3314,8 +3319,8 @@ Except_Intersect_Rewrite(Query *parsetree)
  * least one non negated Query node. This node is attached to the
  * beginning of the list */
 
-void
-create_list(Node *ptr, List **intersect_list)
+static void
+create_intersect_list(Node *ptr, List **intersect_list)
 {
 	List	   *arg;
 
@@ -3337,7 +3342,7 @@ create_list(Node *ptr, List **intersect_list)
 		else
 		{
 			foreach(arg, ((Expr *) ptr)->args)
-				create_list(lfirst(arg), intersect_list);
+				create_intersect_list(lfirst(arg), intersect_list);
 			return;
 		}
 		return;
@@ -3348,7 +3353,7 @@ create_list(Node *ptr, List **intersect_list)
  * The node given in first_select has already been cooked, so don't transform
  * it again but return a pointer to the previously cooked version given in 'parsetree'
  * instead. */
-Node *
+static Node *
 intersect_tree_analyze(Node *tree, Node *first_select, Node *parsetree)
 {
 	Node	   *result = (Node *) NIL;
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 7be8d080ec..d87adef16c 100644
--- 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.31 1999/05/25 16:10:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.32 1999/05/26 12:55:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -516,6 +516,7 @@ AddHavingQual(Query *parsetree, Node *havingQual)
 		parsetree->havingQual = (Node *) make_andclause(makeList(parsetree->havingQual, copy, -1));
 }
 
+#ifdef NOT_USED
 void
 AddNotHavingQual(Query *parsetree, Node *havingQual)
 {
@@ -531,6 +532,7 @@ AddNotHavingQual(Query *parsetree, Node *havingQual)
 
 	AddHavingQual(parsetree, copy);
 }
+#endif
 
 void
 AddNotQual(Query *parsetree, Node *qual)
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 190a576956..0f61f2be91 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Id: fd.c,v 1.41 1999/05/25 22:41:57 momjian Exp $
+ *	  $Id: fd.c,v 1.42 1999/05/26 12:55:51 momjian Exp $
  *
  * NOTES:
  *
@@ -191,6 +191,7 @@ static int	FileAccess(File file);
 static File fileNameOpenFile(FileName fileName, int fileFlags, int fileMode);
 static char *filepath(char *filename);
 static long pg_nofile(void);
+static int	BufFileFlush(BufFile *file);
 
 /*
  * pg_fsync --- same as fsync except does nothing if -F switch was given
@@ -1168,7 +1169,7 @@ BufFileWrite(BufFile *file, void *ptr, size_t size)
  *
  * Like fflush()
  */
-int
+static int
 BufFileFlush(BufFile *file)
 {
 	if (file->dirty)
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index fbafe1e6bd..cbed22b8c4 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.116 1999/05/25 16:11:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.117 1999/05/26 12:55:55 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -190,6 +190,7 @@ int			_exec_repeat_ = 1;
 static char InteractiveBackend(char *inBuf);
 static char SocketBackend(char *inBuf);
 static char ReadCommand(char *inBuf);
+static void pg_exec_query(char *query_string);
 
 
 /* ----------------------------------------------------------------
@@ -647,7 +648,7 @@ pg_parse_and_plan(char *query_string,	/* string to execute */
  * ----------------------------------------------------------------
  */
 
-void
+static void
 pg_exec_query(char *query_string)
 {
 	pg_exec_query_dest(query_string, whereToSendOutput, FALSE);
@@ -1526,7 +1527,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.116 $ $Date: 1999/05/25 16:11:40 $\n");
+		puts("$Revision: 1.117 $ $Date: 1999/05/26 12:55:55 $\n");
 	}
 
 	/* ----------------
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index ce24c4635a..ce5aefee6b 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -1,7 +1,7 @@
 /*
  *	Edmund Mergl <E.Mergl@bawue.de>
  *
- *	$Id: oracle_compat.c,v 1.17 1999/02/21 03:49:32 scrappy Exp $
+ *	$Id: oracle_compat.c,v 1.18 1999/05/26 12:56:00 momjian Exp $
  *
  */
 
@@ -472,6 +472,7 @@ rtrim(text *string, text *set)
  *
  ********************************************************************/
 
+#ifdef NOT_USED
 text *
 substr(text *string, int4 m, int4 n)
 {
@@ -498,7 +499,7 @@ substr(text *string, int4 m, int4 n)
 
 	return ret;
 }
-
+#endif
 
 /********************************************************************
  *
diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c
index 3ba1626c03..04bb063e3b 100644
--- a/src/backend/utils/misc/trace.c
+++ b/src/backend/utils/misc/trace.c
@@ -131,6 +131,7 @@ tprintf(int flag, const char *fmt,...)
 /*
  * Print a timestamp and a message to stdout or to syslog.
  */
+#ifdef NOT_USED
 int
 tprintf1(const char *fmt,...)
 {
@@ -156,6 +157,7 @@ tprintf1(const char *fmt,...)
 
 	return 1;
 }
+#endif
 
 /*
  * Print a timestamp and a message to stderr.
@@ -237,7 +239,8 @@ tprintf_timestamp()
 
 #endif
 
-int
+#ifdef NOT_USED
+static int
 option_flag(int flag)
 {
 	if ((flag < 0) || (flag >= NUM_PG_OPTIONS))
@@ -254,6 +257,7 @@ set_option_flag(int flag, int value)
 	pg_options[flag] = value;
 	return value;
 }
+#endif
 
 /*
  * Parse an option string like "name,name+,name-,name=value".
diff --git a/src/backend/utils/mmgr/oset.c b/src/backend/utils/mmgr/oset.c
index 8aca4a2ec0..9a0d2781c1 100644
--- a/src/backend/utils/mmgr/oset.c
+++ b/src/backend/utils/mmgr/oset.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.12 1999/05/25 16:12:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.13 1999/05/26 12:56:05 momjian Exp $
  *
  * NOTE
  *	  XXX This is a preliminary implementation which lacks fail-fast
@@ -52,11 +52,13 @@ OrderedSetInit(OrderedSet set, Offset offset)
  * OrderedSetContains
  *		True iff ordered set contains given element.
  */
+#ifdef NOT_USED
 bool
 OrderedSetContains(OrderedSet set, OrderedElem elem)
 {
 	return (bool) (elem->set == set && (elem->next || elem->prev));
 }
+#endif
 
 /*
  * OrderedSetGetHead
diff --git a/src/bin/pg_passwd/pg_passwd.c b/src/bin/pg_passwd/pg_passwd.c
index 0718a3153b..239b373948 100644
--- a/src/bin/pg_passwd/pg_passwd.c
+++ b/src/bin/pg_passwd/pg_passwd.c
@@ -27,15 +27,14 @@ extern char *crypt(const char *, const char *);
 #endif
 
 char	   *comname;
-void		usage(FILE *stream);
-void		read_pwd_file(char *filename);
-void		write_pwd_file(char *filename, char *bkname);
-void		encrypt_pwd(char key[9], char salt[3], char passwd[14]);
-int			check_pwd(char key[9], char passwd[14]);
-void		prompt_for_username(char *username);
-void		prompt_for_password(char *prompt, char *password);
-
-void
+static void	usage(FILE *stream);
+static void	read_pwd_file(char *filename);
+static void	write_pwd_file(char *filename, char *bkname);
+static void	encrypt_pwd(char key[9], char salt[3], char passwd[14]);
+static void	prompt_for_username(char *username);
+static void	prompt_for_password(char *prompt, char *password);
+
+static void
 usage(FILE *stream)
 {
 	fprintf(stream, "Usage: %s <password file>\n", comname);
@@ -54,7 +53,7 @@ pg_pwd		pwds[MAXPWDS];
 int			npwds = 0;
 
 
-void
+static void
 read_pwd_file(char *filename)
 {
 	FILE	   *fp;
@@ -176,7 +175,7 @@ try_again:
 	fclose(fp);
 }
 
-void
+static void
 write_pwd_file(char *filename, char *bkname)
 {
 	FILE	   *fp;
@@ -222,7 +221,7 @@ link_again:
 	fclose(fp);
 }
 
-void
+static void
 encrypt_pwd(char key[9], char salt[3], char passwd[14])
 {
 	int			n;
@@ -253,7 +252,8 @@ encrypt_pwd(char key[9], char salt[3], char passwd[14])
 	 */
 }
 
-int
+#ifdef NOT_USED
+static int
 check_pwd(char key[9], char passwd[14])
 {
 	char		shouldbe[14];
@@ -266,8 +266,9 @@ check_pwd(char key[9], char passwd[14])
 
 	return strncmp(shouldbe, passwd, 13) == 0 ? 1 : 0;
 }
+#endif
 
-void
+static void
 prompt_for_username(char *username)
 {
 	int			length;
@@ -290,7 +291,7 @@ prompt_for_username(char *username)
 		username[length - 1] = '\0';
 }
 
-void
+static void
 prompt_for_password(char *prompt, char *password)
 {
 	int			length;
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index a340bb78da..7728eadc0d 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.17 1999/02/13 23:20:59 momjian Exp $
+ * $Id: valid.h,v 1.18 1999/05/26 12:56:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -146,6 +146,4 @@ do \
 	} \
 } while (0)
 
-extern bool TupleUpdatedByCurXactAndCmd(HeapTuple t);
-
 #endif	 /* VALID_H */
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index dbf901c67e..da806aa433 100644
--- a/src/include/lib/stringinfo.h
+++ b/src/include/lib/stringinfo.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: stringinfo.h,v 1.12 1999/05/25 16:13:59 momjian Exp $
+ * $Id: stringinfo.h,v 1.13 1999/05/26 12:56:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,11 +60,13 @@ typedef StringInfoData *StringInfo;
  *-------------------------
  */
 
+#ifdef NOT_USED
 /*------------------------
  * makeStringInfo
  * Create an empty 'StringInfoData' & return a pointer to it.
  */
 extern StringInfo makeStringInfo(void);
+#endif
 
 /*------------------------
  * initStringInfo
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index 4f78a575f3..eb7c53cb1a 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: auth.h,v 1.11 1999/02/13 23:21:33 momjian Exp $
+ * $Id: auth.h,v 1.12 1999/05/26 12:56:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,6 @@
  */
 
 void		be_recvauth(Port *port);
-void		auth_failed(Port *port);
 
 #define PG_KRB4_VERSION "PGVER4.1"		/* at most KRB_SENDAUTH_VLEN chars */
 #define PG_KRB5_VERSION "PGVER5.1"
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 09d5a1bae5..8415069f0f 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.48 1999/03/23 16:51:03 momjian Exp $
+ * $Id: nodes.h,v 1.49 1999/05/26 12:56:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -281,11 +281,6 @@ extern void *stringToNode(char *str);
 extern void *copyObject(void *obj);
 
 /*
- * nodes/freefuncs.c
- */
-extern void freeObject(void *obj);
-
-/*
  * nodes/equalfuncs.c
  */
 extern bool equal(void *a, void *b);
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 203a988327..ee39919245 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.29 1999/05/25 22:43:11 momjian Exp $
+ * $Id: paths.h,v 1.30 1999/05/26 12:56:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -83,8 +83,6 @@ extern List *make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel,
 						  List *joininfo_list, Relids only_relids);
 extern List *make_rels_by_clauseless_joins(RelOptInfo *old_rel,
 							  List *inner_rels);
-extern RelOptInfo *make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo);
-extern List *new_join_tlist(List *tlist, int first_resdomno);
 extern RelOptInfo *get_cheapest_complete_rel(List *join_rel_list);
 
 /*
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 71c11b7b87..edf4da525e 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.26 1999/05/25 16:14:22 momjian Exp $
+ * $Id: planmain.h,v 1.27 1999/05/26 12:56:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,9 +57,6 @@ extern List *index_outerjoin_references(List *inner_indxqual,
 extern void replace_tlist_with_subplan_refs(List *tlist,
 								Index subvarno,
 								List *subplanTargetList);
-extern void replace_vars_with_subplan_refs(Node *clause,
-							   Index subvarno,
-							   List *subplanTargetList);
 extern bool set_agg_tlist_references(Agg *aggNode);
 extern void del_agg_tlist_references(List *tlist);
 extern void check_having_for_ungrouped_vars(Node *clause,
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index 65d886494c..82cac2e233 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_clause.h,v 1.8 1999/02/23 08:05:27 thomas Exp $
+ * $Id: parse_clause.h,v 1.9 1999/05/26 12:56:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,4 @@ extern List *transformGroupClause(ParseState *pstate, List *grouplist,
 extern List *transformSortClause(ParseState *pstate,
 					List *orderlist, List *sortClause,
 					List *targetlist, char *uniqueFlag);
-extern List *transformUnionClause(List *unionClause, List *targetlist);
-
 #endif	 /* PARSE_CLAUSE_H */
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 1d4b594f32..285b00f3f7 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_expr.h,v 1.10 1998/09/01 04:37:33 momjian Exp $
+ * $Id: parse_expr.h,v 1.11 1999/05/26 12:56:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 #include <parser/parse_node.h>
 
 extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence);
-extern Node *transformIdent(ParseState *pstate, Node *expr, int precedence);
 extern Oid	exprType(Node *expr);
 extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int32 attypmod);
 
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index be2feae6ca..2b5caebba4 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteHandler.h,v 1.9 1999/05/25 16:14:34 momjian Exp $
+ * $Id: rewriteHandler.h,v 1.10 1999/05/26 12:56:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,10 +35,5 @@ typedef struct _rewrite_meta_knowledge RewriteInfo;
 
 extern List *QueryRewrite(Query *parsetree);
 
-/***S*I***/
-extern Query *Except_Intersect_Rewrite(Query *parsetree);
-extern void create_list(Node *ptr, List **intersect_list);
-extern Node *intersect_tree_analyze(Node *tree, Node *first_select, Node *parsetree);
-extern void check_targetlists_are_compatible(List *prev_target, List *current_target);
 
 #endif	 /* REWRITEHANDLER_H */
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index c258bb1103..389676daba 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteManip.h,v 1.15 1999/05/25 16:14:35 momjian Exp $
+ * $Id: rewriteManip.h,v 1.16 1999/05/26 12:56:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@ void		AddQual(Query *parsetree, Node *qual);
 void		AddHavingQual(Query *parsetree, Node *havingQual);
 
 void		AddNotQual(Query *parsetree, Node *qual);
-void		AddNotHavingQual(Query *parsetree, Node *havingQual);
 void		AddGroupClause(Query *parsetree, List *group_by, List *tlist);
 
 void		FixNew(RewriteInfo *info, Query *parsetree);
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 94db91af02..361b8c15eb 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fd.h,v 1.15 1999/05/25 22:43:24 momjian Exp $
+ * $Id: fd.h,v 1.16 1999/05/26 12:56:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -94,7 +94,6 @@ extern BufFile *BufFileCreate(File file);
 extern void BufFileClose(BufFile *file);
 extern size_t BufFileRead(BufFile *file, void *ptr, size_t size);
 extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size);
-extern int	BufFileFlush(BufFile *file);
 extern long BufFileSeek(BufFile *file, long offset, int whence);
 
 /* Miscellaneous support routines */
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 535d974b9a..d0351a5f95 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.20 1999/05/25 16:14:48 momjian Exp $
+ * $Id: tcopprot.h,v 1.21 1999/05/26 12:56:58 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -43,7 +43,6 @@ extern bool InError;
 extern List *pg_parse_and_plan(char *query_string, Oid *typev, int nargs,
 				  List **queryListP, CommandDest dest,
 				  bool aclOverride);
-extern void pg_exec_query(char *query_string);
 extern void pg_exec_query_acl_override(char *query_string);
 extern void
 			pg_exec_query_dest(char *query_string, CommandDest dest, bool aclOverride);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 1d434bf3f2..1d8044ca54 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.80 1999/05/25 22:43:31 momjian Exp $
+ * $Id: builtins.h,v 1.81 1999/05/26 12:57:03 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -518,7 +518,6 @@ extern text *lpad(text *string1, int4 len, text *string2);
 extern text *rpad(text *string1, int4 len, text *string2);
 extern text *ltrim(text *string, text *set);
 extern text *rtrim(text *string, text *set);
-extern text *substr(text *string, int4 m, int4 n);
 extern text *translate(text *string, char from, char to);
 
 /* acl.c */
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 26483f06fc..74f0090243 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.26 1999/05/25 22:43:36 momjian Exp $
+ * $Id: memutils.h,v 1.27 1999/05/26 12:57:07 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -80,7 +80,6 @@ struct OrderedSetData
 };
 
 extern void OrderedSetInit(OrderedSet set, Offset offset);
-extern bool OrderedSetContains(OrderedSet set, OrderedElem elem);
 extern Pointer OrderedSetGetHead(OrderedSet set);
 extern Pointer OrderedElemGetPredecessor(OrderedElem elem);
 extern Pointer OrderedElemGetSuccessor(OrderedElem elem);
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index 8dce7013d4..1ec2fd480c 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -27,11 +27,8 @@ char	   *tprintf_timestamp(void);
 #define TIMESTAMP_SIZE 0
 #endif
 
-extern int	tprintf1(const char *fmt,...);
 extern int	tprintf(int flag, const char *fmt,...);
 extern int	eprintf(const char *fmt,...);
-extern int	option_flag(int flag);
-extern int	set_option_flag(int flag, int value);
 extern void write_syslog(int level, char *line);
 extern void parse_options(char *str, bool secure);
 extern void read_pg_options(SIGNAL_ARGS);
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 5d05566ad4..62f94ec0ae 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -3,7 +3,7 @@
  *			  procedural language (PL)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.11 1999/05/25 22:43:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.12 1999/05/26 12:57:23 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -114,7 +114,7 @@ static void pltcl_init_load_unknown(void);
 #endif	 /* PLTCL_UNKNOWN_SUPPORT */
 
 Datum pltcl_call_handler(FmgrInfo *proinfo,
-				   FmgrValues *proargs, bool *isNull);
+						 FmgrValues *proargs, bool *isNull);
 
 static Datum pltcl_func_handler(FmgrInfo *proinfo,
 				   FmgrValues *proargs, bool *isNull);
@@ -367,6 +367,8 @@ pltcl_init_load_unknown(void)
  *				  call this function for execution of
  *				  PL/Tcl procedures.
  **********************************************************************/
+
+/* keep non-static */
 Datum
 pltcl_call_handler(FmgrInfo *proinfo,
 				   FmgrValues *proargs,
@@ -404,7 +406,6 @@ pltcl_call_handler(FmgrInfo *proinfo,
 	return retval;
 }
 
-
 /**********************************************************************
  * pltcl_func_handler()		- Handler for regular function calls
  **********************************************************************/
-- 
2.11.0