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

17 files changed, 21 insertions, 166 deletions

diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 6aa5b72b7f0..5d9451d9689 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: acl.h,v 1.6 1997/05/22 00:16:41 scrappy Exp $
+ * $Id: acl.h,v 1.7 1997/08/19 21:40:18 momjian Exp $
  *
  * NOTES
  *    For backward-compatability purposes we have to allow there
@@ -128,7 +128,6 @@ extern char *aclcheck_error_strings[];
 /*
  * routines used internally (parser, etc.) 
  */
-extern char *aclparse(char *s, AclItem *aip, unsigned *modechg);
 extern Acl *aclownerdefault(AclId ownerid);
 extern Acl *acldefault(void);
 extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg);
@@ -154,7 +153,6 @@ extern int32 aclcontains(Acl *acl, AclItem *aip);
 extern void ChangeAcl(char *relname, AclItem *mod_aip, unsigned modechg);
 extern AclId get_grosysid(char *groname);
 extern char *get_groname(AclId grosysid);
-extern int32 aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode);
 
 /* XXX move these elsewhere -pma */
 extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode);
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index d27f89691e8..2e574323637 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.3 1996/11/04 07:18:39 scrappy Exp $
+ * $Id: array.h,v 1.4 1997/08/19 21:40:21 momjian Exp $
  *
  * NOTES
  *    XXX the data array should be LONGALIGN'd -- notice that the array
@@ -125,9 +125,6 @@ extern char *array_assgn(ArrayType *array, int n, int upperIndx[],
 		  int lowerIndx[], ArrayType *newArr, int reftype,
 		  int len, bool *isNull);
 extern int array_eq (ArrayType *array1, ArrayType *array2);
-extern SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]);
-extern char *array_seek(char *ptr, int eltsize, int nitems);
-extern int array_read(char *destptr, int eltsize, int nitems, char *srcptr);
 extern int _LOtransfer(char **destfd, int size,	int nitems, char **srcfd,
 		int isSrcLO, int isDestLO);
 
@@ -154,8 +151,6 @@ extern int next_tuple(int n, int curr[], int span[]);
  */
 extern char * _ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize,
 			  int *nbytes, char *chunkfile);
-extern int GetChunkSize(FILE *fd, int ndim, int dim[MAXDIM], int baseSize, 
-			int d[MAXDIM]);
 extern int _ReadChunkArray(int st[], int endp[], int bsize, int fp,
 		char *destfp, ArrayType *array, int isDestLO, bool *isNull);
 extern struct varlena *_ReadChunkArray1El(int st[], int bsize, int fp,
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 7599deb9adb..9a28e1f3ca6 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.20 1997/07/29 16:16:10 thomas Exp $
+ * $Id: builtins.h,v 1.21 1997/08/19 21:40:26 momjian Exp $
  *
  * NOTES
  *    This should normally only be included by fmgr.h.
@@ -166,11 +166,8 @@ extern bool namegt(NameData *arg1, NameData *arg2);
 extern bool namege(NameData *arg1, NameData *arg2);
 extern int namecmp(Name n1, Name n2);
 extern int namecpy(Name n1, Name n2);
-extern int namecat(Name n1, Name n2);
 extern int namestrcpy(Name name, char *str);
-extern int namestrcat(Name name, char *str);
 extern int namestrcmp(Name name, char *str);
-extern uint32 NameComputeLength(Name name);
 
 /* numutils.c */
 /* XXX hack.  HP-UX has a ltoa (with different arguments) already. */
@@ -180,8 +177,6 @@ extern uint32 NameComputeLength(Name name);
 extern int32 pg_atoi(char *s, int size, int c);
 extern void itoa(int i, char *a);
 extern void ltoa(int32 l, char *a);
-extern int ftoa(double value, char *ascii, int width, int prec1, char format);
-extern int atof1(char *str, double *val);
 
 /*
  *	Per-opclass comparison functions for new btrees.  These are
@@ -261,6 +256,7 @@ extern DateTime *datetime_in(char *str);
 extern char *datetime_out(DateTime *datetime);
 extern TimeSpan *timespan_in(char *str);
 extern char *timespan_out(TimeSpan *timespan);
+extern int datetime2tm( DateTime dt, int *tzp, struct tm *tm, double *fsec, char **tzn);
 
 /* filename.c */
 extern char *filename_in(char *file);
@@ -341,6 +337,7 @@ extern bool float84gt(float64 arg1, float32 arg2);
 extern bool float84ge(float64 arg1, float32 arg2);
 
 /* geo_ops.c, geo_selfuncs.c */
+extern double *box_area(BOX *box);
 
 /* misc.c */
 extern bool nullvalue(Datum value, bool *isNull);
@@ -356,7 +353,6 @@ extern int32 userfntest(int i);
 /* not_in.c */
 extern bool int4notin(int16 not_in_arg, char *relation_and_attr);
 extern bool oidnotin(Oid the_oid, char *compare);
-extern int my_varattno(Relation rd, char *a);
 
 /* oid.c */
 extern Oid *oid8in(char *oidString);
@@ -462,11 +458,9 @@ extern uint32 hashvarchar(struct varlena *key);
 
 /* varlena.c */
 extern struct varlena *byteain(char *inputText);
-extern struct varlena *shove_bytes(unsigned char *stuff, int len);
 extern char *byteaout(struct varlena *vlena);
 extern struct varlena *textin(char *inputText);
 extern char *textout(struct varlena *vlena);
-extern int textlen (text* t);
 extern text *textcat(text* t1, text* t2);
 extern bool texteq(struct varlena *arg1, struct varlena *arg2);
 extern bool textne(struct varlena *arg1, struct varlena *arg2);
@@ -525,7 +519,6 @@ extern bool namelike(NameData *n, struct varlena *p);
 extern bool namenlike(NameData *s, struct varlena *p);
 extern bool textlike(struct varlena *s, struct varlena *p);
 extern bool textnlike(struct varlena *s, struct varlena *p);
-extern int like(char *text, char *p);
 
 /* oracle_compat.c */
 
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 98ad9230991..70a40c3e0a5 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.4 1996/11/04 11:51:15 scrappy Exp $
+ * $Id: catcache.h,v 1.5 1997/08/19 21:40:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,14 +61,6 @@ typedef struct catcache {
 extern struct catcache	*Caches;
 extern GlobalMemory	CacheCxt;
 
-extern void CatalogCacheInitializeCache(struct catcache *cache, 
-					Relation relation);
-extern void CatalogCacheSetId(CatCache *cacheInOutP, int id);
-extern long comphash(long l, char *v);
-extern Index CatalogCacheComputeHashIndex(struct catcache *cacheInP);
-extern Index CatalogCacheComputeTupleHashIndex(struct catcache *cacheInOutP,
-				       Relation relation, HeapTuple tuple);
-extern void CatCacheRemoveCTup(CatCache *cache, Dlelem *e);  
 extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex, 
 				     ItemPointer pointer);
 extern void ResetSystemCache(void);
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index fb8c26d9800..da98e780fab 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.15 1997/07/29 16:16:12 thomas Exp $
+ * $Id: dt.h,v 1.16 1997/08/19 21:40:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -270,14 +270,12 @@ extern bool timespan_lt(TimeSpan *span1, TimeSpan *span2);
 extern bool timespan_le(TimeSpan *span1, TimeSpan *span2);
 extern bool timespan_ge(TimeSpan *span1, TimeSpan *span2);
 extern bool timespan_gt(TimeSpan *span1, TimeSpan *span2);
-extern bool timespan_finite(TimeSpan *span);
 extern TimeSpan *timespan_smaller(TimeSpan *span1, TimeSpan *span2);
 extern TimeSpan *timespan_larger(TimeSpan *span1, TimeSpan *span2);
 
 extern text *datetime_text(DateTime *datetime);
 extern DateTime *text_datetime(text *str);
 extern text *timespan_text(TimeSpan *timespan);
-extern TimeSpan *text_timespan(text *str);
 extern DateTime *datetime_trunc(text *units, DateTime *datetime);
 extern TimeSpan *timespan_trunc(text *units, TimeSpan *timespan);
 extern float64 datetime_part(text *units, DateTime *datetime);
@@ -296,46 +294,26 @@ extern TimeSpan *datetime_age(DateTime *dt1, DateTime *dt2);
 extern void GetCurrentTime(struct tm *tm);
 extern DateTime SetDateTime(DateTime datetime);
 extern int tm2datetime(struct tm *tm, double fsec, int *tzp, DateTime *dt);
-extern int datetime2tm( DateTime dt, int *tzp, struct tm *tm, double *fsec, char **tzn);
-
-extern int timespan2tm(TimeSpan span, struct tm *tm, float8 *fsec);
-extern int tm2timespan(struct tm *tm, double fsec, TimeSpan *span);
-
-extern DateTime dt2local( DateTime dt, int timezone);
 
 extern void j2date( int jd, int *year, int *month, int *day);
 extern int date2j( int year, int month, int day);
-extern int j2day( int jd);
 
 extern double time2t(const int hour, const int min, const double sec);
-extern void dt2time(DateTime dt, int *hour, int *min, double *sec);
 
 extern int ParseDateTime( char *timestr, char *lowstr,
   char *field[], int ftype[], int maxfields, int *numfields);
 extern int DecodeDateTime( char *field[], int ftype[],
  int nf, int *dtype, struct tm *tm, double *fsec, int *tzp);
-extern int DecodeDate(char *str, int fmask, int *tmask, struct tm *tm);
-extern int DecodeNumber( int flen, char *field,
- int fmask, int *tmask, struct tm *tm, double *fsec);
-extern int DecodeNumberField( int len, char *str,
- int fmask, int *tmask, struct tm *tm, double *fsec);
-extern int DecodeTime(char *str,
- int fmask, int *tmask, struct tm *tm, double *fsec);
+
 extern int DecodeTimeOnly( char *field[], int ftype[], int nf,
  int *dtype, struct tm *tm, double *fsec);
-extern int DecodeTimezone( char *str, int *tzp);
-extern int DecodeSpecial(int field, char *lowtoken, int *val);
 
 extern int DecodeDateDelta( char *field[], int ftype[],
  int nf, int *dtype, struct tm *tm, double *fsec);
-extern int DecodeUnits(int field, char *lowtoken, int *val);
 
-extern int EncodeSpecialDateTime(DateTime dt, char *str);
 extern int EncodeDateOnly(struct tm *tm, int style, char *str);
 extern int EncodeTimeOnly(struct tm *tm, double fsec, int style, char *str);
 extern int EncodeDateTime(struct tm *tm, double fsec, int *tzp, char **tzn, int style, char *str);
 extern int EncodeTimeSpan(struct tm *tm, double fsec, int style, char *str);
 
-extern datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
-
 #endif /* DT_H */
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index e3cc43b34c0..12bfdfc4c80 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: exc.h,v 1.6 1996/12/10 07:04:22 bryanh Exp $
+ * $Id: exc.h,v 1.7 1997/08/19 21:40:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,14 +75,6 @@ typedef	void ExcProc(Exception*, ExcDetail, ExcData, ExcMessage);
  * prototypes for functions in exc.c
  */
 extern void EnableExceptionHandling(bool on);
-extern void ExcPrint(Exception *excP, ExcDetail detail, ExcData data,
-		     ExcMessage message);
-extern ExcProc *ExcGetUnCaught(void);
-extern ExcProc *ExcSetUnCaught(ExcProc *newP);
-extern void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data,
-			ExcMessage message);
-extern void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data,
-			ExcMessage message);
 extern void ExcRaise(Exception *excP,
 		     ExcDetail detail,
 		     ExcData    data,
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index 034dee7743f..cac5ac811e8 100644
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geo_decls.h,v 1.6 1997/07/29 16:16:13 thomas Exp $
+ * $Id: geo_decls.h,v 1.7 1997/08/19 21:40:34 momjian Exp $
  *
  * NOTE
  *    These routines do *not* use the float types from adt/.
@@ -140,8 +140,6 @@ typedef struct {
 /* public point routines */
 extern Point *point_in(char *str);
 extern char *point_out(Point *pt);
-extern Point *point_construct(double x, double y);
-extern Point *point_copy(Point *pt);
 extern bool point_left(Point *pt1, Point *pt2);
 extern bool point_right(Point *pt1, Point *pt2);
 extern bool point_above(Point *pt1, Point *pt2);
@@ -182,7 +180,6 @@ extern double *dist_pb(Point *pt, BOX *box);
 extern double *dist_sl(LSEG *lseg, LINE *line);
 extern double *dist_sb(LSEG *lseg, BOX *box);
 extern double *dist_lb(LINE *line, BOX *box);
-extern Point *interpt_sl(LSEG *lseg, LINE *line);
 extern Point *close_pl(Point *pt, LINE *line);
 extern Point *close_ps(Point *pt, LSEG *lseg);
 extern Point *close_pb(Point *pt, BOX *box);
@@ -201,9 +198,6 @@ extern bool inter_lb(LINE *line, BOX *box);
 
 /* private routines */
 extern LSEG *lseg_construct(Point *pt1, Point *pt2);
-extern void statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2);
-extern double lseg_dt(LSEG *l1, LSEG *l2);
-extern void make_bound_box(POLYGON *poly);
 
 /* public box routines */
 extern BOX *box_in(char *str);
@@ -224,7 +218,6 @@ extern bool box_eq(BOX *box1, BOX *box2);
 extern bool box_le(BOX *box1, BOX *box2);
 extern bool box_ge(BOX *box1, BOX *box2);
 extern Point *box_center(BOX *box);
-extern double *box_area(BOX *box);
 extern double *box_width(BOX *box);
 extern double *box_height(BOX *box);
 extern double *box_distance(BOX *box1, BOX *box2);
@@ -233,13 +226,7 @@ extern BOX *box_intersect(BOX *box1, BOX *box2);
 extern LSEG *box_diagonal(BOX *box);
 
 /* private routines */
-extern BOX *box_construct(double x1, double x2, double y1, double y2);
-extern BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2);
-extern BOX *box_copy(BOX *box);
 
-extern double box_ar(BOX *box);
-extern double box_wd(BOX *box);
-extern double box_ht(BOX *box);
 extern double box_dt(BOX *box1, BOX *box2);
 
 extern BOX *box(Point *p1, Point *p2);
@@ -249,16 +236,7 @@ extern BOX *box_mul(BOX *box, Point *p);
 extern BOX *box_div(BOX *box, Point *p);
 
 /* private line routines */
-extern LINE *line_construct_pm(Point *pt, double m);
-extern LINE *line_construct_pp(Point *pt1, Point *pt2);
-extern bool line_intersect(LINE *l1, LINE *l2);
-extern bool line_parallel(LINE *l1, LINE *l2);
-extern bool line_perp(LINE *l1, LINE *l2);
-extern bool line_vertical(LINE *line);
-extern bool line_horizontal(LINE *line);
-extern bool line_eq(LINE *l1, LINE *l2);
 extern double *line_distance(LINE *l1, LINE *l2);
-extern Point *line_interpt(LINE *l1, LINE *l2);
 
 /* public path routines */
 extern PATH *path_in(char *str);
@@ -292,10 +270,6 @@ extern POLYGON *path_poly(PATH *path);
 extern PATH *upgradepath(PATH *path);
 extern bool isoldpath(PATH *path);
 
-/* private routines */
-extern double path_ln(PATH *path);
-extern bool plist_same(int npts, Point p1[], Point p2[]);
-
 /* public polygon routines */
 extern POLYGON *poly_in(char *s);
 extern char *poly_out(POLYGON *poly);
@@ -348,7 +322,6 @@ extern CIRCLE *circle_add_pt(CIRCLE *circle, Point *point);
 extern CIRCLE *circle_sub_pt(CIRCLE *circle, Point *point);
 extern CIRCLE *circle_mul_pt(CIRCLE *circle, Point *point);
 extern CIRCLE *circle_div_pt(CIRCLE *circle, Point *point);
-extern double *circle_area(CIRCLE *circle);
 extern double *circle_diameter(CIRCLE *circle);
 extern double *circle_radius(CIRCLE *circle);
 extern double *circle_distance(CIRCLE *circle1, CIRCLE *circle2);
@@ -362,7 +335,7 @@ extern CIRCLE *poly_circle(POLYGON *poly);
 extern POLYGON *circle_poly(int npts, CIRCLE *circle);
 
 /* private routines */
-extern double circle_ar(CIRCLE *circle);
+extern double *circle_area(CIRCLE *circle);
 extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2);
 
 /* geo_selfuncs.c */
@@ -370,13 +343,5 @@ extern float64 areasel(Oid opid, Oid relid, AttrNumber attno,
 	char *value, int32 flag);
 extern float64 areajoinsel(Oid opid, Oid relid, AttrNumber attno,
 	char *value, int32 flag);
-extern float64 leftsel(Oid opid, Oid relid, AttrNumber attno,
-	char *value, int32 flag);
-extern float64 leftjoinsel(Oid opid, Oid relid, AttrNumber attno,
-	char *value, int32 flag);
-extern float64 contsel(Oid opid, Oid relid, AttrNumber attno,
-	char *value, int32 flag);
-extern float64 contjoinsel(Oid opid, Oid relid, AttrNumber attno,
-	char *value, int32 flag);
 
 #endif	/* GEO_DECLS_H */
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index bdf221bc2d7..3f5727fba0f 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hsearch.h,v 1.2 1996/10/31 09:51:20 scrappy Exp $
+ * $Id: hsearch.h,v 1.3 1997/08/19 21:40:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -135,6 +135,5 @@ extern long *hash_seq(HTAB *hashp);
  */
 extern long string_hash(char *key, int keysize);
 extern long tag_hash(int *key, int keysize);
-extern long disk_hash(char *key);
 
 #endif /* HSEARCH_H */
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index d54d8c5ab66..0c993f5964b 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.3 1996/11/04 11:51:18 scrappy Exp $
+ * $Id: inval.h,v 1.4 1997/08/19 21:40:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,14 +42,5 @@ typedef InvalidationEntry	LocalInvalid;
 
 #define EmptyLocalInvalid	NULL
 
-extern InvalidationEntry InvalidationEntryAllocate(uint16 size);
-
-extern LocalInvalid LocalInvalidRegister(LocalInvalid invalid,
-					 InvalidationEntry entry);
-
-extern void LocalInvalidInvalidate(LocalInvalid invalid, void (*function)());
-
-extern void getmyrelids(void);
-
 #endif	/* INVAL_H */
 
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 7e1bf907b8b..82f465814e3 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.2 1996/11/04 11:51:20 scrappy Exp $
+ * $Id: lsyscache.h,v 1.3 1997/08/19 21:40:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,10 +37,8 @@ extern struct varlena * get_relstub(Oid relid, int no, bool *islast);
 extern Oid get_ruleid(char *rulename);
 extern Oid get_eventrelid(Oid ruleid);
 extern int16 get_typlen(Oid typid);
-extern char get_typalign(Oid typid);
 extern bool get_typbyval(Oid typid);
 extern struct varlena *get_typdefault(Oid typid);
-extern char get_typtype(Oid typid);
 
 #endif	/* LSYSCACHE_H */
 
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index 21d405bc88f..9d0b649f40e 100644
--- a/src/include/utils/mcxt.h
+++ b/src/include/utils/mcxt.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: mcxt.h,v 1.4 1996/11/04 11:51:21 scrappy Exp $
+ * $Id: mcxt.h,v 1.5 1997/08/19 21:40:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,8 +43,6 @@ extern Pointer MemoryContextRealloc(MemoryContext context,
 				    Pointer pointer,
 				    Size size);
 extern void MemoryContextFree(MemoryContext context, Pointer pointer);
-extern char *MemoryContextGetName(MemoryContext context);
-extern Size PointerGetAllocSize(Pointer pointer);
 extern MemoryContext MemoryContextSwitchTo(MemoryContext context);
 extern GlobalMemory CreateGlobalMemory(char *name);
 extern void GlobalMemoryDestroy(GlobalMemory context);
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index b6f013cdbe1..979b9f79844 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.6 1997/03/12 21:13:19 scrappy Exp $
+ * $Id: memutils.h,v 1.7 1997/08/19 21:40:43 momjian Exp $
  *
  * NOTES
  *    some of the information in this file will be moved to
@@ -120,7 +120,6 @@ struct OrderedSetData {
 extern void OrderedSetInit(OrderedSet set, Offset offset);
 extern bool OrderedSetContains(OrderedSet set, OrderedElem elem);
 extern Pointer OrderedSetGetHead(OrderedSet set);
-extern Pointer OrderedSetGetTail(OrderedSet set);
 extern Pointer OrderedElemGetPredecessor(OrderedElem elem);
 extern Pointer OrderedElemGetSuccessor(OrderedElem elem);
 extern void  OrderedElemPop(OrderedElem elem);
@@ -226,12 +225,6 @@ extern void AllocSetFree(AllocSet set, AllocPointer pointer);
 extern AllocPointer AllocSetRealloc(AllocSet set, AllocPointer pointer, 
 				    Size size);
 
-extern int AllocSetIterate(AllocSet set,
-			     void (*function)(AllocPointer pointer));
-
-extern int AllocSetCount(AllocSet set);
-
-extern void AllocPointerDump(AllocPointer pointer);
 extern void AllocSetDump(AllocSet set);
 
 /*****************************************************************************
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 0d6888e1d7e..4db0fefa50c 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nabstime.h,v 1.9 1997/07/29 16:16:14 thomas Exp $
+ * $Id: nabstime.h,v 1.10 1997/08/19 21:40:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -112,7 +112,6 @@ extern DateTime *abstime_datetime(AbsoluteTime abstime);
 extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2);
 extern bool AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2);
 
-extern AbsoluteTime tm2abstime(struct tm *tm, int tz);
 extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm *tm, char *tzn);
 
 #endif /* NABSTIME_H */
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index b385097f197..49f907c3f0b 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.3 1996/11/04 11:51:22 scrappy Exp $
+ * $Id: portal.h,v 1.4 1997/08/19 21:40:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,7 +62,6 @@ struct PortalD {
 #define	VACPNAME	"<vacuum>"
 
 extern bool PortalNameIsSpecial(char *pname);
-extern void CollectNamedPortals(Portal *portalP, int destroy);
 extern void AtEOXact_portals(void);
 extern void EnablePortalManager(bool on);
 extern Portal GetPortalByName(char *name);
@@ -74,15 +73,10 @@ extern QueryDesc *PortalGetQueryDesc(Portal portal);
 extern EState *PortalGetState(Portal portal);
 extern Portal CreatePortal(char *name);
 extern void PortalDestroy(Portal *portalP);
-extern void PortalResetHeapMemory(Portal portal);
 extern void StartPortalAllocMode(AllocMode mode, Size limit);
 extern void EndPortalAllocMode(void);
 extern PortalVariableMemory PortalGetVariableMemory(Portal portal);
 extern PortalHeapMemory PortalGetHeapMemory(Portal portal);
-extern Portal PortalVariableMemoryGetPortal(PortalVariableMemory context);
-extern Portal PortalHeapMemoryGetPortal(PortalHeapMemory context);
-extern PortalHeapMemory PortalVariableMemoryGetHeapMemory(PortalVariableMemory context);
-extern PortalVariableMemory PortalHeapMemoryGetVariableMemory(PortalHeapMemory context);
 
 /* estimate of the maximum number of open portals a user would have,
  * used in initially sizing the PortalHashTable in  EnablePortalManager() 
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
index c6c6c29fb91..d7f979c8ff7 100644
--- a/src/include/utils/psort.h
+++ b/src/include/utils/psort.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: psort.h,v 1.6 1997/08/06 07:02:49 momjian Exp $
+ * $Id: psort.h,v 1.7 1997/08/19 21:40:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -96,22 +96,9 @@ if (1) CODE; else
 
 /* psort.c */
 extern bool psort_begin(Sort *node, int nkeys, ScanKey key);
-extern void inittapes(Sort *node);
-extern void resetpsort(void);
-extern void initialrun(Sort *node, bool *empty);
-extern bool createrun(Sort *node, FILE *file, bool *empty);
-extern HeapTuple tuplecopy(HeapTuple tup);
-extern FILE *mergeruns(Sort *node);
-extern void merge(Sort *node, struct tape *dest);
-
-extern void dumptuples(FILE *file, Sort *node);
 extern HeapTuple psort_grabtuple(Sort *node);
 extern void psort_markpos(Sort *node);
 extern void psort_restorepos(Sort *node);
 extern void psort_end(Sort *node);
 
-extern FILE *gettape(void);
-extern void resettape(FILE *file);
-extern void destroytape(FILE *file);
-
 #endif	/* PSORT_H */
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 81880cf0905..7b1a0c2196b 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relcache.h,v 1.5 1997/06/04 09:01:49 vadim Exp $
+ * $Id: relcache.h,v 1.6 1997/08/19 21:40:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,14 +19,10 @@
  * relation lookup routines
  */
 extern Relation RelationIdCacheGetRelation(Oid relationId);
-extern Relation RelationNameCacheGetRelation(char *relationName);
 extern Relation RelationIdGetRelation(Oid relationId);
 extern Relation RelationNameGetRelation(char *relationName);
-extern Relation getreldesc(char *relationName);
 
 extern void RelationClose(Relation relation);
-extern void RelationFlushRelation(Relation *relationPtr,
-				  bool	onlyFlushReferenceCountZero);
 extern void RelationForgetRelation(Oid rid);
 extern void RelationIdInvalidateRelationCacheByRelationId(Oid relationId);
 
@@ -38,8 +34,5 @@ extern void RelationCacheInvalidate(bool onlyFlushReferenceCountZero);
 extern void RelationRegisterRelation(Relation relation);
 extern void RelationPurgeLocalRelation(bool xactComitted);
 extern void RelationInitialize(void);
-extern void init_irels(void);
-extern void write_irels(void);
-
 
 #endif	/* RELCACHE_H */
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index dc8139266d4..9c45ce0650c 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tqual.h,v 1.5 1996/11/04 07:18:46 scrappy Exp $
+ * $Id: tqual.h,v 1.6 1997/08/19 21:40:50 momjian Exp $
  *
  * NOTE
  *    It may be desirable to allow time qualifications to indicate
@@ -34,16 +34,6 @@ extern TimeQual	SelfTimeQual;
 extern void setheapoverride(bool on);
 extern bool heapisoverride(void);
 
-extern bool TimeQualIsValid(TimeQual qual);
-extern bool TimeQualIsLegal(TimeQual qual);
-extern bool TimeQualIncludesNow(TimeQual qual);
-extern bool TimeQualIncludesPast(TimeQual qual);
-extern bool TimeQualIsSnapshot(TimeQual qual);
-extern bool TimeQualIsRanged(TimeQual qual);
-extern bool TimeQualIndicatesDisableValidityChecking(TimeQual qual);
-extern AbsoluteTime TimeQualGetSnapshotTime(TimeQual qual);
-extern AbsoluteTime TimeQualGetStartTime(TimeQual qual);
-extern AbsoluteTime TimeQualGetEndTime(TimeQual qual);
 extern TimeQual TimeFormSnapshotTimeQual(AbsoluteTime time);
 extern TimeQual TimeFormRangedTimeQual(AbsoluteTime startTime,
 				       AbsoluteTime endTime);