Used modified version of indent that understands over 100 typedefs.

25 files changed, 347 insertions, 347 deletions

diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index fcf6ca32ece..b35dbd199a9 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.10 1997/09/08 20:59:15 momjian Exp $
+ * $Id: acl.h,v 1.11 1997/09/08 21:54:47 momjian Exp $
  *
  * NOTES
  *	  For backward-compatability purposes we have to allow there
@@ -142,7 +142,7 @@ extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg);
 extern char *aclmakepriv(char *old_privlist, char new_priv);
 extern char *aclmakeuser(char *user_type, char *user);
 extern ChangeACLStmt *
-makeAclStmt(char *privs, List * rel_list, char *grantee,
+makeAclStmt(char *privs, List *rel_list, char *grantee,
 			char grant_or_revoke);
 
 /*
@@ -165,10 +165,10 @@ extern char *get_groname(AclId grosysid);
 /* XXX move these elsewhere -pma */
 extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode);
 extern int32 pg_ownercheck(char *usename, char *value, int cacheid);
-extern		int32
+extern int32
 pg_func_ownercheck(char *usename, char *funcname,
-				   int nargs, Oid * arglist);
-extern		int32
+				   int nargs, Oid *arglist);
+extern int32
 pg_aggr_ownercheck(char *usename, char *aggname,
 				   Oid basetypeID);
 
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index b8116065d4b..d09330e92ab 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.7 1997/09/08 20:59:18 momjian Exp $
+ * $Id: array.h,v 1.8 1997/09/08 21:54:49 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -109,27 +109,27 @@ typedef struct
 {
 	char		lo_name[NAME_LEN];
 	int			C[MAXDIM];
-}			CHUNK_INFO;
+} CHUNK_INFO;
 
 /*
  * prototypes for functions defined in arrayfuncs.c
  */
 extern char *array_in(char *string, Oid element_type);
 extern char *array_out(ArrayType *v, Oid element_type);
-extern char *array_dims(ArrayType *v, bool * isNull);
-extern		Datum
+extern char *array_dims(ArrayType *v, bool *isNull);
+extern Datum
 array_ref(ArrayType *array, int n, int indx[], int reftype,
-		  int elmlen, int arraylen, bool * isNull);
-extern		Datum
+		  int elmlen, int arraylen, bool *isNull);
+extern Datum
 array_clip(ArrayType *array, int n, int upperIndx[],
-		   int lowerIndx[], int reftype, int len, bool * isNull);
+		   int lowerIndx[], int reftype, int len, bool *isNull);
 extern char *
 array_set(ArrayType *array, int n, int indx[], char *dataPtr,
-		  int reftype, int elmlen, int arraylen, bool * isNull);
+		  int reftype, int elmlen, int arraylen, bool *isNull);
 extern char *
 array_assgn(ArrayType *array, int n, int upperIndx[],
 			int lowerIndx[], ArrayType *newArr, int reftype,
-			int len, bool * isNull);
+			int len, bool *isNull);
 extern int	array_eq(ArrayType *array1, ArrayType *array2);
 extern int
 _LOtransfer(char **destfd, int size, int nitems, char **srcfd,
@@ -157,14 +157,14 @@ extern int	next_tuple(int n, int curr[], int span[]);
  * prototypes for functions defined in chunk.c
  */
 extern char *
-_ChunkArray(int fd, FILE * afd, int ndim, int dim[], int baseSize,
+_ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize,
 			int *nbytes, char *chunkfile);
 extern int
 _ReadChunkArray(int st[], int endp[], int bsize, int fp,
-			char *destfp, ArrayType *array, int isDestLO, bool * isNull);
+			 char *destfp, ArrayType *array, int isDestLO, bool *isNull);
 extern struct varlena *
 _ReadChunkArray1El(int st[], int bsize, int fp,
-				   ArrayType *array, bool * isNull);
+				   ArrayType *array, bool *isNull);
 
 
 #endif							/* ARRAY_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index f7fc9d21904..58d6885f354 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.24 1997/09/08 20:59:19 momjian Exp $
+ * $Id: builtins.h,v 1.25 1997/09/08 21:54:50 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -92,7 +92,7 @@ extern int32 char8cmp(char *arg1, char *arg2);
 extern int32 int2in(char *num);
 extern char *int2out(int16 sh);
 extern int16 *int28in(char *shs);
-extern char *int28out(int16(*shs)[]);
+extern char *int28out(int16 (*shs)[]);
 extern int32 *int44in(char *input_string);
 extern char *int44out(int32 an_array[]);
 extern int32 int4in(char *num);
@@ -123,7 +123,7 @@ extern bool int42lt(int32 arg1, int32 arg2);
 extern bool int42le(int32 arg1, int32 arg2);
 extern bool int42gt(int32 arg1, int32 arg2);
 extern bool int42ge(int32 arg1, int32 arg2);
-extern bool keyfirsteq(int16 * arg1, int16 arg2);
+extern bool keyfirsteq(int16 *arg1, int16 arg2);
 extern int32 int4um(int32 arg);
 extern int32 int4pl(int32 arg1, int32 arg2);
 extern int32 int4mi(int32 arg1, int32 arg2);
@@ -157,13 +157,13 @@ extern int32 int4smaller(int32 arg1, int32 arg2);
 
 /* name.c */
 extern NameData *namein(char *s);
-extern char *nameout(NameData * s);
-extern bool nameeq(NameData * arg1, NameData * arg2);
-extern bool namene(NameData * arg1, NameData * arg2);
-extern bool namelt(NameData * arg1, NameData * arg2);
-extern bool namele(NameData * arg1, NameData * arg2);
-extern bool namegt(NameData * arg1, NameData * arg2);
-extern bool namege(NameData * arg1, NameData * arg2);
+extern char *nameout(NameData *s);
+extern bool nameeq(NameData *arg1, NameData *arg2);
+extern bool namene(NameData *arg1, NameData *arg2);
+extern bool namelt(NameData *arg1, NameData *arg2);
+extern bool namele(NameData *arg1, NameData *arg2);
+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	namestrcpy(Name name, char *str);
@@ -195,7 +195,7 @@ extern int32 btchar2cmp(uint16 a, uint16 b);
 extern int32 btchar4cmp(uint32 a, uint32 b);
 extern int32 btchar8cmp(char *a, char *b);
 extern int32 btchar16cmp(char *a, char *b);
-extern int32 btnamecmp(NameData * a, NameData * b);
+extern int32 btnamecmp(NameData *a, NameData *b);
 extern int32 bttextcmp(struct varlena * a, struct varlena * b);
 
 /* support routines for the rtree access method, by opclass */
@@ -203,9 +203,9 @@ extern BOX *rt_box_union(BOX *a, BOX *b);
 extern BOX *rt_box_inter(BOX *a, BOX *b);
 extern void rt_box_size(BOX *a, float *size);
 extern void rt_bigbox_size(BOX *a, float *size);
-extern void rt_poly_size(POLYGON * a, float *size);
-extern POLYGON *rt_poly_union(POLYGON * a, POLYGON * b);
-extern POLYGON *rt_poly_inter(POLYGON * a, POLYGON * b);
+extern void rt_poly_size(POLYGON *a, float *size);
+extern POLYGON *rt_poly_union(POLYGON *a, POLYGON *b);
+extern POLYGON *rt_poly_inter(POLYGON *a, POLYGON *b);
 
 /* projection utilities */
 /* extern char *GetAttributeByName();
@@ -222,7 +222,7 @@ extern int32 reltimein(char *timestring);
 extern char *reltimeout(int32 timevalue);
 extern TimeInterval tintervalin(char *intervalstr);
 extern char *tintervalout(TimeInterval interval);
-extern RelativeTime timespan_reltime(TimeSpan * timespan);
+extern RelativeTime timespan_reltime(TimeSpan *timespan);
 extern TimeSpan *reltime_timespan(RelativeTime reltime);
 extern TimeInterval mktinterval(AbsoluteTime t1, AbsoluteTime t2);
 extern AbsoluteTime timepl(AbsoluteTime t1, RelativeTime t2);
@@ -254,9 +254,9 @@ extern text *timeofday(void);
 
 /* dt.c */
 extern DateTime *datetime_in(char *str);
-extern char *datetime_out(DateTime * datetime);
+extern char *datetime_out(DateTime *datetime);
 extern TimeSpan *timespan_in(char *str);
-extern char *timespan_out(TimeSpan * timespan);
+extern char *timespan_out(TimeSpan *timespan);
 extern int	datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
 
 /* filename.c */
@@ -341,8 +341,8 @@ extern bool float84ge(float64 arg1, float32 arg2);
 extern double *box_area(BOX *box);
 
 /* misc.c */
-extern bool nullvalue(Datum value, bool * isNull);
-extern bool nonnullvalue(Datum value, bool * isNull);
+extern bool nullvalue(Datum value, bool *isNull);
+extern bool nonnullvalue(Datum value, bool *isNull);
 extern bool oidrand(Oid o, int32 X);
 extern bool oidsrand(int32 X);
 extern int32 userfntest(int i);
@@ -357,7 +357,7 @@ extern bool oidnotin(Oid the_oid, char *compare);
 
 /* oid.c */
 extern Oid *oid8in(char *oidString);
-extern char *oid8out(Oid(*oidArray)[]);
+extern char *oid8out(Oid (*oidArray)[]);
 extern Oid	oidin(char *s);
 extern char *oidout(Oid o);
 extern bool oideq(Oid arg1, Oid arg2);
@@ -375,8 +375,8 @@ extern bool char8regexeq(char *s, struct varlena * p);
 extern bool char8regexne(char *s, struct varlena * p);
 extern bool char16regexeq(char *s, struct varlena * p);
 extern bool char16regexne(char *s, struct varlena * p);
-extern bool nameregexeq(NameData * n, struct varlena * p);
-extern bool nameregexne(NameData * s, struct varlena * p);
+extern bool nameregexeq(NameData *n, struct varlena * p);
+extern bool nameregexne(NameData *s, struct varlena * p);
 extern bool textregexeq(struct varlena * s, struct varlena * p);
 extern bool textregexne(struct varlena * s, struct varlena * p);
 extern bool char2icregexeq(uint16 arg1, struct varlena * p);
@@ -387,8 +387,8 @@ extern bool char8icregexeq(char *s, struct varlena * p);
 extern bool char8icregexne(char *s, struct varlena * p);
 extern bool char16icregexeq(char *s, struct varlena * p);
 extern bool char16icregexne(char *s, struct varlena * p);
-extern bool nameicregexeq(NameData * s, struct varlena * p);
-extern bool nameicregexne(NameData * s, struct varlena * p);
+extern bool nameicregexeq(NameData *s, struct varlena * p);
+extern bool nameicregexne(NameData *s, struct varlena * p);
 extern bool texticregexeq(struct varlena * s, struct varlena * p);
 extern bool texticregexne(struct varlena * s, struct varlena * p);
 
@@ -462,14 +462,14 @@ extern struct varlena *byteain(char *inputText);
 extern char *byteaout(struct varlena * vlena);
 extern struct varlena *textin(char *inputText);
 extern char *textout(struct varlena * vlena);
-extern text *textcat(text * t1, text * t2);
+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);
 extern bool text_lt(struct varlena * arg1, struct varlena * arg2);
 extern bool text_le(struct varlena * arg1, struct varlena * arg2);
 extern bool text_gt(struct varlena * arg1, struct varlena * arg2);
 extern bool text_ge(struct varlena * arg1, struct varlena * arg2);
-extern int32 textpos(text * t1, text * t2);
+extern int32 textpos(text *t1, text *t2);
 extern int32 byteaGetSize(struct varlena * v);
 extern int32 byteaGetByte(struct varlena * v, int32 n);
 extern int32 byteaGetBit(struct varlena * v, int32 n);
@@ -492,19 +492,19 @@ extern int32 date_mi(DateADT dateVal1, DateADT dateVal2);
 extern DateADT date_pli(DateADT dateVal, int32 days);
 extern DateADT date_mii(DateADT dateVal, int32 days);
 extern DateTime *date_datetime(DateADT date);
-extern DateADT datetime_date(DateTime * datetime);
-extern DateTime *datetime_datetime(DateADT date, TimeADT * time);
+extern DateADT datetime_date(DateTime *datetime);
+extern DateTime *datetime_datetime(DateADT date, TimeADT *time);
 extern DateADT abstime_date(AbsoluteTime abstime);
 
 extern TimeADT *time_in(char *timestr);
-extern char *time_out(TimeADT * time);
-extern bool time_eq(TimeADT * time1, TimeADT * time2);
-extern bool time_ne(TimeADT * time1, TimeADT * time2);
-extern bool time_lt(TimeADT * time1, TimeADT * time2);
-extern bool time_le(TimeADT * time1, TimeADT * time2);
-extern bool time_gt(TimeADT * time1, TimeADT * time2);
-extern bool time_ge(TimeADT * time1, TimeADT * time2);
-extern int	time_cmp(TimeADT * time1, TimeADT * time2);
+extern char *time_out(TimeADT *time);
+extern bool time_eq(TimeADT *time1, TimeADT *time2);
+extern bool time_ne(TimeADT *time1, TimeADT *time2);
+extern bool time_lt(TimeADT *time1, TimeADT *time2);
+extern bool time_le(TimeADT *time1, TimeADT *time2);
+extern bool time_gt(TimeADT *time1, TimeADT *time2);
+extern bool time_ge(TimeADT *time1, TimeADT *time2);
+extern int	time_cmp(TimeADT *time1, TimeADT *time2);
 extern int32 int42reltime(int32 timevalue);
 
 /* like.c */
@@ -516,22 +516,22 @@ extern bool char8like(char *s, struct varlena * p);
 extern bool char8nlike(char *s, struct varlena * p);
 extern bool char16like(char *s, struct varlena * p);
 extern bool char16nlike(char *s, struct varlena * p);
-extern bool namelike(NameData * n, struct varlena * p);
-extern bool namenlike(NameData * s, struct varlena * p);
+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);
 
 /* oracle_compat.c */
 
-extern text *lower(text * string);
-extern text *upper(text * string);
-extern text *initcap(text * string);
-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);
+extern text *lower(text *string);
+extern text *upper(text *string);
+extern text *initcap(text *string);
+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/cash.h b/src/include/utils/cash.h
index 4a88219090e..dc1692dee97 100644
--- a/src/include/utils/cash.h
+++ b/src/include/utils/cash.h
@@ -12,24 +12,24 @@
 /* if we store this as 4 bytes, we better make it int, not long, bjm */
 typedef signed int Cash;
 
-extern const char *cash_out(Cash * value);
+extern const char *cash_out(Cash *value);
 extern Cash *cash_in(const char *str);
 
-extern bool cash_eq(Cash * c1, Cash * c2);
-extern bool cash_ne(Cash * c1, Cash * c2);
-extern bool cash_lt(Cash * c1, Cash * c2);
-extern bool cash_le(Cash * c1, Cash * c2);
-extern bool cash_gt(Cash * c1, Cash * c2);
-extern bool cash_ge(Cash * c1, Cash * c2);
+extern bool cash_eq(Cash *c1, Cash *c2);
+extern bool cash_ne(Cash *c1, Cash *c2);
+extern bool cash_lt(Cash *c1, Cash *c2);
+extern bool cash_le(Cash *c1, Cash *c2);
+extern bool cash_gt(Cash *c1, Cash *c2);
+extern bool cash_ge(Cash *c1, Cash *c2);
 
-extern Cash *cash_pl(Cash * c1, Cash * c2);
-extern Cash *cash_mi(Cash * c1, Cash * c2);
-extern Cash *cash_mul(Cash * c, float8 * f);
-extern Cash *cash_div(Cash * c, float8 * f);
+extern Cash *cash_pl(Cash *c1, Cash *c2);
+extern Cash *cash_mi(Cash *c1, Cash *c2);
+extern Cash *cash_mul(Cash *c, float8 *f);
+extern Cash *cash_div(Cash *c, float8 *f);
 
-extern Cash *cashlarger(Cash * c1, Cash * c2);
-extern Cash *cashsmaller(Cash * c1, Cash * c2);
+extern Cash *cashlarger(Cash *c1, Cash *c2);
+extern Cash *cashsmaller(Cash *c1, Cash *c2);
 
-extern const char *cash_words_out(Cash * value);
+extern const char *cash_words_out(Cash *value);
 
 #endif							/* CASH_H */
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index c7dc6283445..d84da610ec9 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.7 1997/09/08 02:39:34 momjian Exp $
+ * $Id: catcache.h,v 1.8 1997/09/08 21:54:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@ typedef struct catctup
 	Dlelem	   *ct_node;		/* points to LRU list is the CatCTup is in
 								 * the cache, else, points to the cache if
 								 * the CatCTup is in LRU list */
-}			CatCTup;
+} CatCTup;
 
 /* voodoo constants */
 #define NCCBUCK 500				/* CatCache buckets */
@@ -43,7 +43,7 @@ typedef struct catcache
 	Oid			indexId;
 	char	   *cc_relname;		/* relation name for defered open */
 	char	   *cc_indname;		/* index name for defered open */
-				HeapTuple(*cc_iscanfunc) ();	/* index scanfunction */
+	HeapTuple	(*cc_iscanfunc) ();		/* index scanfunction */
 	TupleDesc	cc_tupdesc;		/* tuple descriptor from reldesc */
 	int			id;				/* XXX could be improved -hirohama */
 	short		cc_ntup;		/* # of tuples in this cache	*/
@@ -56,7 +56,7 @@ typedef struct catcache
 	struct catcache *cc_next;
 	Dllist	   *cc_lrulist;		/* LRU list, most recent first */
 	Dllist	   *cc_cache[NCCBUCK + 1];
-}			CatCache;
+} CatCache;
 
 #define InvalidCatalogCacheId	(-1)
 
@@ -69,8 +69,8 @@ CatalogCacheIdInvalidate(int cacheId, Index hashIndex,
 extern void ResetSystemCache(void);
 extern CatCache *
 InitSysCache(char *relname, char *indname, int id, int nkeys,
-			 int key[], HeapTuple(*iScanfuncP) ());
-extern		HeapTuple
+			 int key[], HeapTuple (*iScanfuncP) ());
+extern HeapTuple
 SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
 			   Datum v3, Datum v4);
 extern void
diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h
index 8fcd2136568..923df6c96a3 100644
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datum.h,v 1.4 1997/09/08 02:39:36 momjian Exp $
+ * $Id: datum.h,v 1.5 1997/09/08 21:54:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,7 +57,7 @@ extern void datumFree(Datum value, Oid type, bool byVal, Size len);
  * return true if thwo datums are equal, false otherwise.
  * XXX : See comments in the code for restrictions!
  */
-extern		bool
+extern bool
 datumIsEqual(Datum value1, Datum value2, Oid type,
 			 bool byVal, Size len);
 
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index 8634b7f03c2..64d270ed74b 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.20 1997/09/08 02:39:37 momjian Exp $
+ * $Id: dt.h,v 1.21 1997/09/08 21:54:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,7 +36,7 @@ typedef struct
 								 * years */
 	int4		month;			/* months and years, after time for
 								 * alignment */
-}			TimeSpan;
+} TimeSpan;
 
 
 /* ----------------------------------------------------------------
@@ -191,7 +191,7 @@ typedef struct
 #endif							/* aix */
 	char		type;
 	char		value;			/* this may be unsigned, alas */
-}			datetkn;
+} datetkn;
 
 #ifdef NAN
 #define DT_INVALID		(NAN)
@@ -260,52 +260,52 @@ extern int	datetime_is_epoch(double j);
  */
 
 extern DateTime *datetime_in(char *str);
-extern char *datetime_out(DateTime * dt);
-extern bool datetime_eq(DateTime * dt1, DateTime * dt2);
-extern bool datetime_ne(DateTime * dt1, DateTime * dt2);
-extern bool datetime_lt(DateTime * dt1, DateTime * dt2);
-extern bool datetime_le(DateTime * dt1, DateTime * dt2);
-extern bool datetime_ge(DateTime * dt1, DateTime * dt2);
-extern bool datetime_gt(DateTime * dt1, DateTime * dt2);
-extern bool datetime_finite(DateTime * datetime);
-extern int	datetime_cmp(DateTime * dt1, DateTime * dt2);
-extern DateTime *datetime_smaller(DateTime * dt1, DateTime * dt2);
-extern DateTime *datetime_larger(DateTime * dt1, DateTime * dt2);
+extern char *datetime_out(DateTime *dt);
+extern bool datetime_eq(DateTime *dt1, DateTime *dt2);
+extern bool datetime_ne(DateTime *dt1, DateTime *dt2);
+extern bool datetime_lt(DateTime *dt1, DateTime *dt2);
+extern bool datetime_le(DateTime *dt1, DateTime *dt2);
+extern bool datetime_ge(DateTime *dt1, DateTime *dt2);
+extern bool datetime_gt(DateTime *dt1, DateTime *dt2);
+extern bool datetime_finite(DateTime *datetime);
+extern int	datetime_cmp(DateTime *dt1, DateTime *dt2);
+extern DateTime *datetime_smaller(DateTime *dt1, DateTime *dt2);
+extern DateTime *datetime_larger(DateTime *dt1, DateTime *dt2);
 
 extern TimeSpan *timespan_in(char *str);
-extern char *timespan_out(TimeSpan * span);
-extern bool timespan_eq(TimeSpan * span1, TimeSpan * span2);
-extern bool timespan_ne(TimeSpan * span1, TimeSpan * span2);
-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 int	timespan_cmp(TimeSpan * span1, TimeSpan * span2);
-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 DateTime *datetime_trunc(text * units, DateTime * datetime);
-extern TimeSpan *timespan_trunc(text * units, TimeSpan * timespan);
-extern float64 datetime_part(text * units, DateTime * datetime);
-extern float64 timespan_part(text * units, TimeSpan * timespan);
-extern text *datetime_zone(text * zone, DateTime * datetime);
-
-extern TimeSpan *timespan_um(TimeSpan * span);
-extern TimeSpan *timespan_pl(TimeSpan * span1, TimeSpan * span2);
-extern TimeSpan *timespan_mi(TimeSpan * span1, TimeSpan * span2);
-extern TimeSpan *timespan_div(TimeSpan * span1, float8 * arg2);
-
-extern TimeSpan *datetime_mi(DateTime * dt1, DateTime * dt2);
-extern DateTime *datetime_pl_span(DateTime * dt, TimeSpan * span);
-extern DateTime *datetime_mi_span(DateTime * dt, TimeSpan * span);
-extern TimeSpan *datetime_age(DateTime * dt1, DateTime * dt2);
+extern char *timespan_out(TimeSpan *span);
+extern bool timespan_eq(TimeSpan *span1, TimeSpan *span2);
+extern bool timespan_ne(TimeSpan *span1, TimeSpan *span2);
+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 int	timespan_cmp(TimeSpan *span1, TimeSpan *span2);
+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 DateTime *datetime_trunc(text *units, DateTime *datetime);
+extern TimeSpan *timespan_trunc(text *units, TimeSpan *timespan);
+extern float64 datetime_part(text *units, DateTime *datetime);
+extern float64 timespan_part(text *units, TimeSpan *timespan);
+extern text *datetime_zone(text *zone, DateTime *datetime);
+
+extern TimeSpan *timespan_um(TimeSpan *span);
+extern TimeSpan *timespan_pl(TimeSpan *span1, TimeSpan *span2);
+extern TimeSpan *timespan_mi(TimeSpan *span1, TimeSpan *span2);
+extern TimeSpan *timespan_div(TimeSpan *span1, float8 *arg2);
+
+extern TimeSpan *datetime_mi(DateTime *dt1, DateTime *dt2);
+extern DateTime *datetime_pl_span(DateTime *dt, TimeSpan *span);
+extern DateTime *datetime_mi_span(DateTime *dt, TimeSpan *span);
+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	tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt);
 
 extern void j2date(int jd, int *year, int *month, int *day);
 extern int	date2j(int year, int month, int day);
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index 7c8b075a90b..13ed4174f36 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynamic_loader.h,v 1.7 1997/09/08 02:39:38 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.8 1997/09/08 21:54:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,7 @@ typedef struct df_files
 	ino_t		inode;			/* Inode number of file */
 	void	   *handle;			/* a handle for pg_dl* functions */
 	struct df_files *next;
-}			DynamicFileList;
+} DynamicFileList;
 
 extern void *pg_dlopen(char *filename);
 extern func_ptr pg_dlsym(void *handle, char *funcname);
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index c8b791cb6f6..bdc9a83d0e6 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.9 1997/09/08 02:39:41 momjian Exp $
+ * $Id: exc.h,v 1.10 1997/09/08 21:54:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,7 +43,7 @@ typedef struct ExcFrame
 	ExcDetail	detail;
 	ExcData		data;
 	ExcMessage	message;
-}			ExcFrame;
+} ExcFrame;
 
 extern ExcFrame *ExcCurFrameP;
 
@@ -71,7 +71,7 @@ extern ExcFrame *ExcCurFrameP;
 #define reraise() \
 		raise4(*exception.id,exception.detail,exception.data,exception.message)
 
-typedef void ExcProc(Exception *, ExcDetail, ExcData, ExcMessage);
+typedef void ExcProc (Exception *, ExcDetail, ExcData, ExcMessage);
 
 
 /*
@@ -79,7 +79,7 @@ typedef void ExcProc(Exception *, ExcDetail, ExcData, ExcMessage);
  */
 extern void EnableExceptionHandling(bool on);
 extern void
-ExcRaise(Exception * excP,
+ExcRaise(Exception *excP,
 		 ExcDetail detail,
 		 ExcData data,
 		 ExcMessage message);
@@ -89,7 +89,7 @@ ExcRaise(Exception * excP,
  * prototypes for functions in excabort.c
  */
 extern void
-ExcAbort(const Exception * excP, ExcDetail detail, ExcData data,
+ExcAbort(const Exception *excP, ExcDetail detail, ExcData data,
 		 ExcMessage message);
 
 #endif							/* EXC_H */
diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h
index af8111676e4..f9ace84b13a 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache.h,v 1.4 1997/09/08 02:39:43 momjian Exp $
+ * $Id: fcache.h,v 1.5 1997/09/08 21:54:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,6 +49,7 @@ typedef struct
 								 * of tuples */
 
 	bool		istrusted;		/* trusted fn? */
-}			FunctionCache, *FunctionCachePtr;
+} FunctionCache,
+		   *FunctionCachePtr;
 
 #endif							/* FCACHE_H */
diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h
index bf9c7fb0c64..9ed3c76603e 100644
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache2.h,v 1.4 1997/09/08 02:39:43 momjian Exp $
+ * $Id: fcache2.h,v 1.5 1997/09/08 21:55:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,6 @@
 #include <nodes/execnodes.h>
 
 extern void
-			setFcache(Node * node, Oid foid, List * argList, ExprContext * econtext);
+			setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext);
 
 #endif							/* FCACHE2_H */
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index a94e7f4811c..953f1811375 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fmgrtab.h,v 1.6 1997/09/08 02:39:44 momjian Exp $
+ * $Id: fmgrtab.h,v 1.7 1997/09/08 21:55:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@ typedef struct
 	uint16		nargs;
 	func_ptr	func;
 	char	   *funcName;
-}			FmgrCall;
+} FmgrCall;
 
 extern FmgrCall *fmgr_isbuiltin(Oid id);
 extern func_ptr fmgr_lookupByName(char *name);
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index be308f28ae8..878f1bb4185 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.11 1997/09/08 20:59:21 momjian Exp $
+ * $Id: geo_decls.h,v 1.12 1997/09/08 21:55:06 momjian Exp $
  *
  * NOTE
  *	  These routines do *not* use the float types from adt/.
@@ -67,7 +67,7 @@ typedef struct
 {
 	double		x,
 				y;
-}			Point;
+} Point;
 
 
 /*---------------------------------------------------------------------
@@ -78,7 +78,7 @@ typedef struct
 	Point		p[2];
 
 	double		m;				/* precomputed to save time, not in tuple */
-}			LSEG;
+} LSEG;
 
 
 /*---------------------------------------------------------------------
@@ -91,7 +91,7 @@ typedef struct
 	int32		closed;			/* is this a closed polygon? */
 	int32		dummy;			/* padding to make it double align */
 	Point		p[1];			/* variable length array of POINTs */
-}			PATH;
+} PATH;
 
 
 /*---------------------------------------------------------------------
@@ -109,7 +109,7 @@ typedef struct
 				C;
 
 	double		m;
-}			LINE;
+} LINE;
 
 
 /*---------------------------------------------------------------------
@@ -133,7 +133,7 @@ typedef struct
 	int32		npts;
 	BOX			boundbox;
 	Point		p[1];			/* variable length array of POINTs */
-}			POLYGON;
+} POLYGON;
 
 /*---------------------------------------------------------------------
  * CIRCLE - Specified by a center point and radius.
@@ -142,7 +142,7 @@ typedef struct
 {
 	Point		center;
 	double		radius;
-}			CIRCLE;
+} CIRCLE;
 
 /*
  * in geo_ops.h
@@ -150,65 +150,65 @@ typedef struct
 
 /* public point routines */
 extern Point *point_in(char *str);
-extern char *point_out(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);
-extern bool point_below(Point * pt1, Point * pt2);
-extern bool point_vert(Point * pt1, Point * pt2);
-extern bool point_horiz(Point * pt1, Point * pt2);
-extern bool point_eq(Point * pt1, Point * pt2);
-extern int32 pointdist(Point * p1, Point * p2);
-extern double *point_distance(Point * pt1, Point * pt2);
-extern double *point_slope(Point * pt1, Point * pt2);
+extern char *point_out(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);
+extern bool point_below(Point *pt1, Point *pt2);
+extern bool point_vert(Point *pt1, Point *pt2);
+extern bool point_horiz(Point *pt1, Point *pt2);
+extern bool point_eq(Point *pt1, Point *pt2);
+extern int32 pointdist(Point *p1, Point *p2);
+extern double *point_distance(Point *pt1, Point *pt2);
+extern double *point_slope(Point *pt1, Point *pt2);
 
 /* private routines */
-extern double point_dt(Point * pt1, Point * pt2);
-extern double point_sl(Point * pt1, Point * pt2);
+extern double point_dt(Point *pt1, Point *pt2);
+extern double point_sl(Point *pt1, Point *pt2);
 
-extern Point *point(float8 * x, float8 * y);
-extern Point *point_add(Point * p1, Point * p2);
-extern Point *point_sub(Point * p1, Point * p2);
-extern Point *point_mul(Point * p1, Point * p2);
-extern Point *point_div(Point * p1, Point * p2);
+extern Point *point(float8 *x, float8 *y);
+extern Point *point_add(Point *p1, Point *p2);
+extern Point *point_sub(Point *p1, Point *p2);
+extern Point *point_mul(Point *p1, Point *p2);
+extern Point *point_div(Point *p1, Point *p2);
 
 /* public lseg routines */
 extern LSEG *lseg_in(char *str);
-extern char *lseg_out(LSEG * ls);
-extern bool lseg_intersect(LSEG * l1, LSEG * l2);
-extern bool lseg_parallel(LSEG * l1, LSEG * l2);
-extern bool lseg_perp(LSEG * l1, LSEG * l2);
-extern bool lseg_vertical(LSEG * lseg);
-extern bool lseg_horizontal(LSEG * lseg);
-extern bool lseg_eq(LSEG * l1, LSEG * l2);
-extern double *lseg_distance(LSEG * l1, LSEG * l2);
-extern Point *lseg_center(LSEG * lseg);
-extern Point *lseg_interpt(LSEG * l1, LSEG * l2);
-extern double *dist_pl(Point * pt, LINE * line);
-extern double *dist_ps(Point * pt, LSEG * lseg);
-extern double *dist_ppath(Point * pt, PATH * path);
-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 *close_pl(Point * pt, LINE * line);
-extern Point *close_ps(Point * pt, LSEG * lseg);
-extern Point *close_pb(Point * pt, BOX *box);
-extern Point *close_sl(LSEG * lseg, LINE * line);
-extern Point *close_sb(LSEG * lseg, BOX *box);
-extern Point *close_lb(LINE * line, BOX *box);
-extern bool on_pl(Point * pt, LINE * line);
-extern bool on_ps(Point * pt, LSEG * lseg);
-extern bool on_pb(Point * pt, BOX *box);
-extern bool on_ppath(Point * pt, PATH * path);
-extern bool on_sl(LSEG * lseg, LINE * line);
-extern bool on_sb(LSEG * lseg, BOX *box);
-extern bool inter_sl(LSEG * lseg, LINE * line);
-extern bool inter_sb(LSEG * lseg, BOX *box);
-extern bool inter_lb(LINE * line, BOX *box);
+extern char *lseg_out(LSEG *ls);
+extern bool lseg_intersect(LSEG *l1, LSEG *l2);
+extern bool lseg_parallel(LSEG *l1, LSEG *l2);
+extern bool lseg_perp(LSEG *l1, LSEG *l2);
+extern bool lseg_vertical(LSEG *lseg);
+extern bool lseg_horizontal(LSEG *lseg);
+extern bool lseg_eq(LSEG *l1, LSEG *l2);
+extern double *lseg_distance(LSEG *l1, LSEG *l2);
+extern Point *lseg_center(LSEG *lseg);
+extern Point *lseg_interpt(LSEG *l1, LSEG *l2);
+extern double *dist_pl(Point *pt, LINE *line);
+extern double *dist_ps(Point *pt, LSEG *lseg);
+extern double *dist_ppath(Point *pt, PATH *path);
+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 *close_pl(Point *pt, LINE *line);
+extern Point *close_ps(Point *pt, LSEG *lseg);
+extern Point *close_pb(Point *pt, BOX *box);
+extern Point *close_sl(LSEG *lseg, LINE *line);
+extern Point *close_sb(LSEG *lseg, BOX *box);
+extern Point *close_lb(LINE *line, BOX *box);
+extern bool on_pl(Point *pt, LINE *line);
+extern bool on_ps(Point *pt, LSEG *lseg);
+extern bool on_pb(Point *pt, BOX *box);
+extern bool on_ppath(Point *pt, PATH *path);
+extern bool on_sl(LSEG *lseg, LINE *line);
+extern bool on_sb(LSEG *lseg, BOX *box);
+extern bool inter_sl(LSEG *lseg, LINE *line);
+extern bool inter_sb(LSEG *lseg, BOX *box);
+extern bool inter_lb(LINE *line, BOX *box);
 
 /* private routines */
-extern LSEG *lseg_construct(Point * pt1, Point * pt2);
+extern LSEG *lseg_construct(Point *pt1, Point *pt2);
 
 /* public box routines */
 extern BOX *box_in(char *str);
@@ -241,120 +241,120 @@ extern LSEG *box_diagonal(BOX *box);
 
 extern double box_dt(BOX *box1, BOX *box2);
 
-extern BOX *box(Point * p1, Point * p2);
-extern BOX *box_add(BOX *box, Point * p);
-extern BOX *box_sub(BOX *box, Point * p);
-extern BOX *box_mul(BOX *box, Point * p);
-extern BOX *box_div(BOX *box, Point * p);
+extern BOX *box(Point *p1, Point *p2);
+extern BOX *box_add(BOX *box, Point *p);
+extern BOX *box_sub(BOX *box, Point *p);
+extern BOX *box_mul(BOX *box, Point *p);
+extern BOX *box_div(BOX *box, Point *p);
 
 /* private line routines */
-extern double *line_distance(LINE * l1, LINE * l2);
+extern double *line_distance(LINE *l1, LINE *l2);
 
 /* public path routines */
 extern PATH *path_in(char *str);
-extern char *path_out(PATH * path);
-extern bool path_n_lt(PATH * p1, PATH * p2);
-extern bool path_n_gt(PATH * p1, PATH * p2);
-extern bool path_n_eq(PATH * p1, PATH * p2);
-extern bool path_n_le(PATH * p1, PATH * p2);
-extern bool path_n_ge(PATH * p1, PATH * p2);
-extern bool path_inter(PATH * p1, PATH * p2);
-extern double *path_distance(PATH * p1, PATH * p2);
-extern double *path_length(PATH * path);
-
-extern bool path_isclosed(PATH * path);
-extern bool path_isopen(PATH * path);
-extern int4 path_npoints(PATH * path);
-
-extern PATH *path_close(PATH * path);
-extern PATH *path_open(PATH * path);
-extern PATH *path_add(PATH * p1, PATH * p2);
-extern PATH *path_add_pt(PATH * path, Point * point);
-extern PATH *path_sub_pt(PATH * path, Point * point);
-extern PATH *path_mul_pt(PATH * path, Point * point);
-extern PATH *path_div_pt(PATH * path, Point * point);
-extern bool path_contain_pt(PATH * path, Point * p);
-extern bool pt_contained_path(Point * p, PATH * path);
-
-extern Point *path_center(PATH * path);
-extern POLYGON *path_poly(PATH * path);
-
-extern PATH *upgradepath(PATH * path);
-extern bool isoldpath(PATH * path);
+extern char *path_out(PATH *path);
+extern bool path_n_lt(PATH *p1, PATH *p2);
+extern bool path_n_gt(PATH *p1, PATH *p2);
+extern bool path_n_eq(PATH *p1, PATH *p2);
+extern bool path_n_le(PATH *p1, PATH *p2);
+extern bool path_n_ge(PATH *p1, PATH *p2);
+extern bool path_inter(PATH *p1, PATH *p2);
+extern double *path_distance(PATH *p1, PATH *p2);
+extern double *path_length(PATH *path);
+
+extern bool path_isclosed(PATH *path);
+extern bool path_isopen(PATH *path);
+extern int4 path_npoints(PATH *path);
+
+extern PATH *path_close(PATH *path);
+extern PATH *path_open(PATH *path);
+extern PATH *path_add(PATH *p1, PATH *p2);
+extern PATH *path_add_pt(PATH *path, Point *point);
+extern PATH *path_sub_pt(PATH *path, Point *point);
+extern PATH *path_mul_pt(PATH *path, Point *point);
+extern PATH *path_div_pt(PATH *path, Point *point);
+extern bool path_contain_pt(PATH *path, Point *p);
+extern bool pt_contained_path(Point *p, PATH *path);
+
+extern Point *path_center(PATH *path);
+extern POLYGON *path_poly(PATH *path);
+
+extern PATH *upgradepath(PATH *path);
+extern bool isoldpath(PATH *path);
 
 /* public polygon routines */
 extern POLYGON *poly_in(char *s);
-extern char *poly_out(POLYGON * poly);
-extern bool poly_left(POLYGON * polya, POLYGON * polyb);
-extern bool poly_overleft(POLYGON * polya, POLYGON * polyb);
-extern bool poly_right(POLYGON * polya, POLYGON * polyb);
-extern bool poly_overright(POLYGON * polya, POLYGON * polyb);
-extern bool poly_same(POLYGON * polya, POLYGON * polyb);
-extern bool poly_overlap(POLYGON * polya, POLYGON * polyb);
-extern bool poly_contain(POLYGON * polya, POLYGON * polyb);
-extern bool poly_contained(POLYGON * polya, POLYGON * polyb);
-extern bool poly_contain_pt(POLYGON * poly, Point * p);
-extern bool pt_contained_poly(Point * p, POLYGON * poly);
-
-extern double *poly_distance(POLYGON * polya, POLYGON * polyb);
-extern int4 poly_npoints(POLYGON * poly);
-extern Point *poly_center(POLYGON * poly);
-extern BOX *poly_box(POLYGON * poly);
-extern PATH *poly_path(POLYGON * poly);
+extern char *poly_out(POLYGON *poly);
+extern bool poly_left(POLYGON *polya, POLYGON *polyb);
+extern bool poly_overleft(POLYGON *polya, POLYGON *polyb);
+extern bool poly_right(POLYGON *polya, POLYGON *polyb);
+extern bool poly_overright(POLYGON *polya, POLYGON *polyb);
+extern bool poly_same(POLYGON *polya, POLYGON *polyb);
+extern bool poly_overlap(POLYGON *polya, POLYGON *polyb);
+extern bool poly_contain(POLYGON *polya, POLYGON *polyb);
+extern bool poly_contained(POLYGON *polya, POLYGON *polyb);
+extern bool poly_contain_pt(POLYGON *poly, Point *p);
+extern bool pt_contained_poly(Point *p, POLYGON *poly);
+
+extern double *poly_distance(POLYGON *polya, POLYGON *polyb);
+extern int4 poly_npoints(POLYGON *poly);
+extern Point *poly_center(POLYGON *poly);
+extern BOX *poly_box(POLYGON *poly);
+extern PATH *poly_path(POLYGON *poly);
 extern POLYGON *box_poly(BOX *box);
 
-extern POLYGON *upgradepoly(POLYGON * poly);
-extern POLYGON *revertpoly(POLYGON * poly);
+extern POLYGON *upgradepoly(POLYGON *poly);
+extern POLYGON *revertpoly(POLYGON *poly);
 
 /* private polygon routines */
 
 /* public circle routines */
 extern CIRCLE *circle_in(char *str);
-extern char *circle_out(CIRCLE * circle);
-extern bool circle_same(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_overlap(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_overleft(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_left(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_right(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_overright(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_contained(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_contain(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_below(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_above(CIRCLE * circle1, CIRCLE * circle2);
-
-extern bool circle_eq(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_ne(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_lt(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_gt(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_le(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_ge(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_contain_pt(CIRCLE * circle, Point * point);
-extern bool pt_contained_circle(Point * point, CIRCLE * circle);
-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_diameter(CIRCLE * circle);
-extern double *circle_radius(CIRCLE * circle);
-extern double *circle_distance(CIRCLE * circle1, CIRCLE * circle2);
-extern double *dist_pc(Point * point, CIRCLE * circle);
-extern double *dist_cpoly(CIRCLE * circle, POLYGON * poly);
-extern Point *circle_center(CIRCLE * circle);
-extern CIRCLE *circle(Point * center, float8 * radius);
+extern char *circle_out(CIRCLE *circle);
+extern bool circle_same(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_overlap(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_overleft(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_left(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_right(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_overright(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_contained(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_contain(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_below(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_above(CIRCLE *circle1, CIRCLE *circle2);
+
+extern bool circle_eq(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_ne(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_lt(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_gt(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_le(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_ge(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_contain_pt(CIRCLE *circle, Point *point);
+extern bool pt_contained_circle(Point *point, CIRCLE *circle);
+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_diameter(CIRCLE *circle);
+extern double *circle_radius(CIRCLE *circle);
+extern double *circle_distance(CIRCLE *circle1, CIRCLE *circle2);
+extern double *dist_pc(Point *point, CIRCLE *circle);
+extern double *dist_cpoly(CIRCLE *circle, POLYGON *poly);
+extern Point *circle_center(CIRCLE *circle);
+extern CIRCLE *circle(Point *center, float8 *radius);
 extern CIRCLE *box_circle(BOX *box);
-extern BOX *circle_box(CIRCLE * circle);
-extern CIRCLE *poly_circle(POLYGON * poly);
-extern POLYGON *circle_poly(int npts, CIRCLE * circle);
+extern BOX *circle_box(CIRCLE *circle);
+extern CIRCLE *poly_circle(POLYGON *poly);
+extern POLYGON *circle_poly(int npts, CIRCLE *circle);
 
 /* private routines */
-extern double *circle_area(CIRCLE * circle);
-extern double circle_dt(CIRCLE * circle1, CIRCLE * circle2);
+extern double *circle_area(CIRCLE *circle);
+extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2);
 
 /* geo_selfuncs.c */
-extern		float64
+extern float64
 areasel(Oid opid, Oid relid, AttrNumber attno,
 		char *value, int32 flag);
-extern		float64
+extern float64
 areajoinsel(Oid opid, Oid relid, AttrNumber attno,
 			char *value, int32 flag);
 
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index 7cc6894c92a..55fe23315dd 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.5 1997/09/08 02:39:47 momjian Exp $
+ * $Id: hsearch.h,v 1.6 1997/09/08 21:55:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,7 +36,7 @@ typedef struct element
 {
 	unsigned long next;			/* secret from user		 */
 	long		key;
-}			ELEMENT;
+} ELEMENT;
 
 typedef unsigned long BUCKET_INDEX;
 
@@ -67,7 +67,7 @@ typedef struct hashhdr
 	long		accesses;
 	long		collisions;
 #endif
-}			HHDR;
+} HHDR;
 
 typedef struct htab
 {
@@ -79,7 +79,7 @@ typedef struct htab
 	long	   *(*alloc) ();	/* memory allocator (long * for alignment
 								 * reasons) */
 
-}			HTAB;
+} HTAB;
 
 typedef struct hashctl
 {
@@ -97,7 +97,7 @@ typedef struct hashctl
 	long	   *dir;			/* directory if allocated already */
 	long	   *hctl;			/* location of header information in shd
 								 * mem */
-}			HASHCTL;
+} HASHCTL;
 
 /* Flags to indicate action for hctl */
 #define HASH_BUCKET		0x001	/* Setting bucket size */
@@ -125,18 +125,18 @@ typedef enum
 	HASH_REMOVE,
 	HASH_FIND_SAVE,
 	HASH_REMOVE_SAVED
-}			HASHACTION;
+} HASHACTION;
 
 /*
  * prototypes from functions in dynahash.c
  */
-extern HTAB *hash_create(int nelem, HASHCTL * info, int flags);
-extern void hash_destroy(HTAB * hashp);
-extern void hash_stats(char *where, HTAB * hashp);
+extern HTAB *hash_create(int nelem, HASHCTL *info, int flags);
+extern void hash_destroy(HTAB *hashp);
+extern void hash_stats(char *where, HTAB *hashp);
 extern long *
-hash_search(HTAB * hashp, char *keyPtr, HASHACTION action,
-			bool * foundPtr);
-extern long *hash_seq(HTAB * hashp);
+hash_search(HTAB *hashp, char *keyPtr, HASHACTION action,
+			bool *foundPtr);
+extern long *hash_seq(HTAB *hashp);
 
 /*
  * prototypes from functions in hashfn.c
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index ada1cf32d12..06ebf21927e 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.6 1997/09/08 02:39:48 momjian Exp $
+ * $Id: inval.h,v 1.7 1997/09/08 21:55:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,13 +30,13 @@ extern void RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple);
 typedef struct InvalidationUserData
 {
 	struct InvalidationUserData *dataP[1];		/* VARIABLE LENGTH */
-}			InvalidationUserData;		/* VARIABLE LENGTH STRUCTURE */
+} InvalidationUserData;			/* VARIABLE LENGTH STRUCTURE */
 
 typedef struct InvalidationEntryData
 {
 	InvalidationUserData *nextP;
 	InvalidationUserData userData;		/* VARIABLE LENGTH ARRAY */
-}			InvalidationEntryData;		/* VARIABLE LENGTH STRUCTURE */
+} InvalidationEntryData;		/* VARIABLE LENGTH STRUCTURE */
 
 typedef Pointer InvalidationEntry;
 
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index f31fa5583d2..a820f2ddaf5 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.6 1997/09/08 02:39:48 momjian Exp $
+ * $Id: lselect.h,v 1.7 1997/09/08 21:55:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,13 +32,13 @@ typedef struct
 	int			nKeys;
 	ScanKey		scanKeys;
 	int			sortMem;		/* needed for psort */
-}			LeftistContextData;
+} LeftistContextData;
 typedef LeftistContextData *LeftistContext;
 
 extern struct leftist *
 lmerge(struct leftist * pt, struct leftist * qt,
 	   LeftistContext context);
-extern		HeapTuple
+extern HeapTuple
 gettuple(struct leftist ** treep, short *devnum,
 		 LeftistContext context);
 extern void
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index cad6ecfbfa4..ca07a4a25cc 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.5 1997/09/08 02:39:49 momjian Exp $
+ * $Id: lsyscache.h,v 1.6 1997/09/08 21:55:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,9 +23,9 @@ extern Oid	get_atttype(Oid relid, AttrNumber attnum);
 extern bool get_attisset(Oid relid, char *attname);
 extern RegProcedure get_opcode(Oid opid);
 extern char *get_opname(Oid opid);
-extern		bool
+extern bool
 op_mergesortable(Oid opid, Oid ltype, Oid rtype,
-				 Oid * leftOp, Oid * rightOp);
+				 Oid *leftOp, Oid *rightOp);
 extern Oid	op_hashjoinable(Oid opid, Oid ltype, Oid rtype);
 extern Oid	get_commutator(Oid opid);
 extern HeapTuple get_operator_tuple(Oid opno);
@@ -34,7 +34,7 @@ extern RegProcedure get_oprrest(Oid opid);
 extern RegProcedure get_oprjoin(Oid opid);
 extern int	get_relnatts(Oid relid);
 extern char *get_rel_name(Oid relid);
-extern struct varlena *get_relstub(Oid relid, int no, bool * islast);
+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);
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index 4c37d33187c..54f77239436 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.7 1997/09/08 02:39:49 momjian Exp $
+ * $Id: mcxt.h,v 1.8 1997/09/08 21:55:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,7 +39,7 @@ extern MemoryContext TopMemoryContext;
  */
 extern void EnableMemoryContext(bool on);
 extern Pointer MemoryContextAlloc(MemoryContext context, Size size);
-extern		Pointer
+extern Pointer
 MemoryContextRealloc(MemoryContext context,
 					 Pointer pointer,
 					 Size size);
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index f1a065caf4a..8fcaee7bc53 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.12 1997/09/08 02:39:51 momjian Exp $
+ * $Id: nabstime.h,v 1.13 1997/09/08 21:55:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,7 @@ typedef struct
 {
 	int32		status;
 	AbsoluteTime data[2];
-}			TimeIntervalData;
+} TimeIntervalData;
 typedef TimeIntervalData *TimeInterval;
 
 /*
@@ -112,7 +112,7 @@ extern bool abstimele(AbsoluteTime t1, AbsoluteTime t2);
 extern bool abstimege(AbsoluteTime t1, AbsoluteTime t2);
 extern bool abstime_finite(AbsoluteTime time);
 
-extern AbsoluteTime datetime_abstime(DateTime * datetime);
+extern AbsoluteTime datetime_abstime(DateTime *datetime);
 extern DateTime *abstime_datetime(AbsoluteTime abstime);
 
 extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2);
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 84a5d539af4..8150bb9caa8 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.6 1997/09/08 02:39:53 momjian Exp $
+ * $Id: portal.h,v 1.7 1997/09/08 21:55:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,7 @@ typedef struct PortalBlockData
 {
 	AllocSetData setData;
 	FixedItemData itemData;
-}			PortalBlockData;
+} PortalBlockData;
 
 typedef PortalBlockData *PortalBlock;
 
@@ -69,13 +69,13 @@ extern void EnablePortalManager(bool on);
 extern Portal GetPortalByName(char *name);
 extern Portal BlankPortalAssignName(char *name);
 extern void
-PortalSetQuery(Portal portal, QueryDesc * queryDesc,
-			   TupleDesc attinfo, EState * state,
+PortalSetQuery(Portal portal, QueryDesc *queryDesc,
+			   TupleDesc attinfo, EState *state,
 			   void (*cleanup) (Portal portal));
 extern QueryDesc *PortalGetQueryDesc(Portal portal);
 extern EState *PortalGetState(Portal portal);
 extern Portal CreatePortal(char *name);
-extern void PortalDestroy(Portal * portalP);
+extern void PortalDestroy(Portal *portalP);
 extern void StartPortalAllocMode(AllocMode mode, Size limit);
 extern void EndPortalAllocMode(void);
 extern PortalVariableMemory PortalGetVariableMemory(Portal portal);
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
index 01fa4153c1e..21366b2220f 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.9 1997/09/08 02:39:54 momjian Exp $
+ * $Id: psort.h,v 1.10 1997/09/08 21:55:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,7 +64,7 @@ typedef struct Psortstate
 	bool		using_tape_files;
 
 	HeapTuple  *memtuples;
-}			Psortstate;
+} Psortstate;
 
 #ifdef	EBUG
 #include <stdio.h>
@@ -98,10 +98,10 @@ if (1) CODE; else
 #endif
 
 /* psort.c */
-extern bool psort_begin(Sort * node, int nkeys, ScanKey key);
-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 bool psort_begin(Sort *node, int nkeys, ScanKey key);
+extern HeapTuple psort_grabtuple(Sort *node);
+extern void psort_markpos(Sort *node);
+extern void psort_restorepos(Sort *node);
+extern void psort_end(Sort *node);
 
 #endif							/* PSORT_H */
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 9fe943c58d6..0dbf0e1c397 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.11 1997/09/08 02:39:55 momjian Exp $
+ * $Id: rel.h,v 1.12 1997/09/08 21:55:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,7 +29,7 @@ typedef struct Trigger
 	int16		tgnargs;
 	int16		tgattr[8];
 	char	  **tgargs;
-}			Trigger;
+} Trigger;
 
 typedef struct TriggerDesc
 {
@@ -42,7 +42,7 @@ typedef struct TriggerDesc
 	Trigger   **tg_after_row[4];
 	Trigger   **tg_after_statement[4];
 	Trigger    *triggers;
-}			TriggerDesc;
+} TriggerDesc;
 
 typedef struct RelationData
 {
@@ -62,7 +62,7 @@ typedef struct RelationData
 	IndexStrategy rd_istrat;
 	RegProcedure *rd_support;
 	TriggerDesc *trigdesc;
-}			RelationData;
+} RelationData;
 
 typedef RelationData *Relation;
 
@@ -190,6 +190,6 @@ extern IndexStrategy RelationGetIndexStrategy(Relation relation);
 
 extern void
 RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
-						RegProcedure * support);
+						RegProcedure *support);
 
 #endif							/* REL_H */
diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h
index 19873d34e28..0f750f47ff9 100644
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel2.h,v 1.3 1997/09/07 05:02:58 momjian Exp $
+ * $Id: rel2.h,v 1.4 1997/09/08 21:55:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,6 @@ extern IndexStrategy RelationGetIndexStrategy(Relation relation);
 
 extern void
 RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
-						RegProcedure * support);
+						RegProcedure *support);
 
 #endif							/* TMP_REL2_H */
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 627356e29a3..54c42a19844 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.6 1997/09/08 02:39:58 momjian Exp $
+ * $Id: syscache.h,v 1.7 1997/09/08 21:55:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,16 +73,15 @@ struct cachedesc
 	int			size;			/* sizeof(appropriate struct) */
 	char	   *indname;		/* index relation for this cache, if
 								 * exists */
-				HeapTuple(*iScanFunc) ();		/* function to handle
-												 * index scans */
+	HeapTuple	(*iScanFunc) ();/* function to handle index scans */
 };
 
 extern void zerocaches(void);
 extern void InitCatalogCache(void);
-extern		HeapTuple
+extern HeapTuple
 SearchSysCacheTuple(int cacheId, Datum key1, Datum key2,
 					Datum key3, Datum key4);
-extern		int32
+extern int32
 SearchSysCacheStruct(int cacheId, char *returnStruct,
 					 Datum key1, Datum key2, Datum key3, Datum key4);
 extern void *
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 579c6e9525e..11253891a98 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.8 1997/09/08 02:39:59 momjian Exp $
+ * $Id: tqual.h,v 1.9 1997/09/08 21:55:19 momjian Exp $
  *
  * NOTE
  *	  It may be desirable to allow time qualifications to indicate
@@ -22,7 +22,7 @@
 typedef struct TimeQualSpace
 {
 	char		data[12];
-}			TimeQualSpace;
+} TimeQualSpace;
 
 typedef Pointer TimeQual;
 
@@ -36,7 +36,7 @@ extern void setheapoverride(bool on);
 extern bool heapisoverride(void);
 
 extern TimeQual TimeFormSnapshotTimeQual(AbsoluteTime time);
-extern		TimeQual
+extern TimeQual
 TimeFormRangedTimeQual(AbsoluteTime startTime,
 					   AbsoluteTime endTime);
 extern bool HeapTupleSatisfiesTimeQual(HeapTuple tuple, TimeQual qual);