diff --git a/contrib/array/array_iterator.c b/contrib/array/array_iterator.c
index 23478fb738..f4ecfad903 100644
--- a/contrib/array/array_iterator.c
+++ b/contrib/array/array_iterator.c
@@ -41,7 +41,7 @@
 #include "utils/elog.h"
 
 static int32
-array_iterator(Oid elemtype, Oid proc, int and, ArrayType * array, Datum value)
+array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
 {
 	HeapTuple	typ_tuple;
 	TypeTupleForm typ_struct;
@@ -157,7 +157,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType * array, Datum value)
  */
 
 int32
-array_texteq(ArrayType * array, char *value)
+array_texteq(ArrayType *array, char *value)
 {
 	return array_iterator((Oid) 25,		/* text */
 						  (Oid) 67,		/* texteq */
@@ -166,7 +166,7 @@ array_texteq(ArrayType * array, char *value)
 }
 
 int32
-array_all_texteq(ArrayType * array, char *value)
+array_all_texteq(ArrayType *array, char *value)
 {
 	return array_iterator((Oid) 25,		/* text */
 						  (Oid) 67,		/* texteq */
@@ -175,7 +175,7 @@ array_all_texteq(ArrayType * array, char *value)
 }
 
 int32
-array_textregexeq(ArrayType * array, char *value)
+array_textregexeq(ArrayType *array, char *value)
 {
 	return array_iterator((Oid) 25,		/* text */
 						  (Oid) 81,		/* textregexeq */
@@ -184,7 +184,7 @@ array_textregexeq(ArrayType * array, char *value)
 }
 
 int32
-array_all_textregexeq(ArrayType * array, char *value)
+array_all_textregexeq(ArrayType *array, char *value)
 {
 	return array_iterator((Oid) 25,		/* text */
 						  (Oid) 81,		/* textregexeq */
@@ -198,7 +198,7 @@ array_all_textregexeq(ArrayType * array, char *value)
  */
 
 int32
-array_char16eq(ArrayType * array, char *value)
+array_char16eq(ArrayType *array, char *value)
 {
 	return array_iterator((Oid) 20,		/* char16 */
 						  (Oid) 490,	/* char16eq */
@@ -207,7 +207,7 @@ array_char16eq(ArrayType * array, char *value)
 }
 
 int32
-array_all_char16eq(ArrayType * array, char *value)
+array_all_char16eq(ArrayType *array, char *value)
 {
 	return array_iterator((Oid) 20,		/* char16 */
 						  (Oid) 490,	/* char16eq */
@@ -216,7 +216,7 @@ array_all_char16eq(ArrayType * array, char *value)
 }
 
 int32
-array_char16regexeq(ArrayType * array, char *value)
+array_char16regexeq(ArrayType *array, char *value)
 {
 	return array_iterator((Oid) 20,		/* char16 */
 						  (Oid) 700,	/* char16regexeq */
@@ -225,7 +225,7 @@ array_char16regexeq(ArrayType * array, char *value)
 }
 
 int32
-array_all_char16regexeq(ArrayType * array, char *value)
+array_all_char16regexeq(ArrayType *array, char *value)
 {
 	return array_iterator((Oid) 20,		/* char16 */
 						  (Oid) 700,	/* char16regexeq */
@@ -238,7 +238,7 @@ array_all_char16regexeq(ArrayType * array, char *value)
  */
 
 int32
-array_int4eq(ArrayType * array, int4 value)
+array_int4eq(ArrayType *array, int4 value)
 {
 	return array_iterator((Oid) 23,		/* int4 */
 						  (Oid) 65,		/* int4eq */
@@ -247,7 +247,7 @@ array_int4eq(ArrayType * array, int4 value)
 }
 
 int32
-array_all_int4eq(ArrayType * array, int4 value)
+array_all_int4eq(ArrayType *array, int4 value)
 {
 	return array_iterator((Oid) 23,		/* int4 */
 						  (Oid) 65,		/* int4eq */
@@ -256,7 +256,7 @@ array_all_int4eq(ArrayType * array, int4 value)
 }
 
 int32
-array_int4gt(ArrayType * array, int4 value)
+array_int4gt(ArrayType *array, int4 value)
 {
 	return array_iterator((Oid) 23,		/* int4 */
 						  (Oid) 147,	/* int4gt */
@@ -265,7 +265,7 @@ array_int4gt(ArrayType * array, int4 value)
 }
 
 int32
-array_all_int4gt(ArrayType * array, int4 value)
+array_all_int4gt(ArrayType *array, int4 value)
 {
 	return array_iterator((Oid) 23,		/* int4 */
 						  (Oid) 147,	/* int4gt */
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index d4b5e893bd..f0bcd60493 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.21 1997/09/08 02:19:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.22 1997/09/08 20:53:40 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -75,7 +75,7 @@ CreateTemplateTupleDesc(int natts)
  * ----------------------------------------------------------------
  */
 TupleDesc
-CreateTupleDesc(int natts, AttributeTupleForm * attrs)
+CreateTupleDesc(int natts, AttributeTupleForm *attrs)
 {
 	TupleDesc	desc;
 
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index d12e4e5c6e..b35cf77573 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -59,7 +59,7 @@ static void GISTInitBuffer(Buffer b, uint32 f);
 static BlockNumber
 gistChooseSubtree(Relation r, IndexTuple itup, int level,
 				  GISTSTATE * giststate,
-				  GISTSTACK ** retstack, Buffer * leafbuf);
+				  GISTSTACK ** retstack, Buffer *leafbuf);
 static OffsetNumber
 gistchoose(Relation r, Page p, IndexTuple it,
 		   GISTSTATE * giststate);
@@ -78,7 +78,7 @@ void
 gistbuild(Relation heap,
 		  Relation index,
 		  int natts,
-		  AttrNumber * attnum,
+		  AttrNumber *attnum,
 		  IndexStrategy istrat,
 		  uint16 pint,
 		  Datum * params,
@@ -470,7 +470,7 @@ gistChooseSubtree(Relation r, IndexTuple itup,	/* itup has compressed
 				  int level,
 				  GISTSTATE * giststate,
 				  GISTSTACK ** retstack /* out */ ,
-				  Buffer * leafbuf /* out */ )
+				  Buffer *leafbuf /* out */ )
 {
 	Buffer		buffer;
 	BlockNumber blk;
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 97e1a631a1..427c222dfc 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.14 1997/09/08 02:20:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.15 1997/09/08 20:53:53 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -45,7 +45,7 @@ void
 hashbuild(Relation heap,
 		  Relation index,
 		  int natts,
-		  AttrNumber * attnum,
+		  AttrNumber *attnum,
 		  IndexStrategy istrat,
 		  uint16 pcount,
 		  Datum * params,
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 5d764b3472..9954fb90d0 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.11 1997/09/08 02:20:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.12 1997/09/08 20:53:59 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -26,7 +26,7 @@
 #include <string.h>
 #endif
 
-static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer * metabufp);
+static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp);
 static uint32 _hash_firstfreebit(uint32 map);
 
 /*
@@ -40,7 +40,7 @@ static uint32 _hash_firstfreebit(uint32 map);
  *
  */
 Buffer
-_hash_addovflpage(Relation rel, Buffer * metabufp, Buffer buf)
+_hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf)
 {
 
 	OverflowPageAddress oaddr;
@@ -100,7 +100,7 @@ _hash_addovflpage(Relation rel, Buffer * metabufp, Buffer buf)
  *
  */
 static OverflowPageAddress
-_hash_getovfladdr(Relation rel, Buffer * metabufp)
+_hash_getovfladdr(Relation rel, Buffer *metabufp)
 {
 	HashMetaPage metap;
 	Buffer		mapbuf = 0;
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 17fdaab37f..259f3cbe20 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.11 1997/09/08 02:20:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.12 1997/09/08 20:54:03 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -270,7 +270,7 @@ _hash_wrtnorelbuf(Relation rel, Buffer buf)
 
 Page
 _hash_chgbufaccess(Relation rel,
-				   Buffer * bufp,
+				   Buffer *bufp,
 				   int from_access,
 				   int to_access)
 {
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 7c3b91b9c0..4c161edb89 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.12 1997/09/08 02:20:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.13 1997/09/08 20:54:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@ void
 _hash_search(Relation rel,
 			 int keysz,
 			 ScanKey scankey,
-			 Buffer * bufP,
+			 Buffer *bufP,
 			 HashMetaPage metap)
 {
 	BlockNumber blkno;
@@ -127,7 +127,7 @@ _hash_next(IndexScanDesc scan, ScanDirection dir)
 
 static void
 _hash_readnext(Relation rel,
-			   Buffer * bufp, Page * pagep, HashPageOpaque * opaquep)
+			   Buffer *bufp, Page * pagep, HashPageOpaque * opaquep)
 {
 	BlockNumber blkno;
 
@@ -146,7 +146,7 @@ _hash_readnext(Relation rel,
 
 static void
 _hash_readprev(Relation rel,
-			   Buffer * bufp, Page * pagep, HashPageOpaque * opaquep)
+			   Buffer *bufp, Page * pagep, HashPageOpaque * opaquep)
 {
 	BlockNumber blkno;
 
@@ -284,7 +284,7 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
  *		'metabuf' is released when this returns.
  */
 bool
-_hash_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir, Buffer metabuf)
+_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf)
 {
 	Relation	rel;
 	ItemPointer current;
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index fa4dbae7ae..e1f969dffa 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.17 1997/09/08 02:20:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.18 1997/09/08 20:54:08 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -214,7 +214,7 @@ static HeapTuple
 heapgettup(Relation relation,
 		   ItemPointer tid,
 		   int dir,
-		   Buffer * b,
+		   Buffer *b,
 		   TimeQual timeQual,
 		   int nkeys,
 		   ScanKey key)
@@ -805,7 +805,7 @@ elog(DEBUG, "heap_getnext([%s,nkeys=%d],backw=%d,0x%x) called", \
 HeapTuple
 heap_getnext(HeapScanDesc scandesc,
 			 int backw,
-			 Buffer * b)
+			 Buffer *b)
 {
 	register HeapScanDesc sdesc = scandesc;
 	Buffer		localb;
@@ -1033,7 +1033,7 @@ HeapTuple
 heap_fetch(Relation relation,
 		   TimeQual timeQual,
 		   ItemPointer tid,
-		   Buffer * b)
+		   Buffer *b)
 {
 	ItemId		lp;
 	Buffer		buffer;
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index fe3bebbccd..7bd074c09a 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.11 1997/09/08 02:20:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.12 1997/09/08 20:54:15 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -56,7 +56,7 @@ typedef struct BTMetaPageData
 #ifdef BTREE_VERSION_1
 	int32		btm_level;
 #endif
-}			BTMetaPageData;
+} BTMetaPageData;
 
 #define BTPageGetMeta(p) \
 	((BTMetaPageData *) &((PageHeader) p)->pd_linp[0])
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 9f7b59327a..203772ee2d 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.21 1997/09/08 02:20:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.22 1997/09/08 20:54:21 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -56,7 +56,7 @@ void
 btbuild(Relation heap,
 		Relation index,
 		int natts,
-		AttrNumber * attnum,
+		AttrNumber *attnum,
 		IndexStrategy istrat,
 		uint16 pcount,
 		Datum * params,
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index 4f3ee1ffe6..7263a09dcf 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.9 1997/09/08 02:20:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.10 1997/09/08 20:54:24 momjian Exp $
  *
  *
  * NOTES
@@ -36,7 +36,7 @@ typedef struct BTScanListData
 {
 	IndexScanDesc btsl_scan;
 	struct BTScanListData *btsl_next;
-}			BTScanListData;
+} BTScanListData;
 
 typedef BTScanListData *BTScanList;
 
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 50f2031779..7b7a4ee2bd 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.25 1997/09/08 02:20:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.26 1997/09/08 20:54:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,7 @@
 
 static BTStack
 _bt_searchr(Relation rel, int keysz, ScanKey scankey,
-			Buffer * bufP, BTStack stack_in);
+			Buffer *bufP, BTStack stack_in);
 static OffsetNumber
 _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page,
 			Size keysz, ScanKey scankey, OffsetNumber offnum);
@@ -38,7 +38,7 @@ static int
 _bt_compare(Relation rel, TupleDesc itupdesc, Page page,
 			int keysz, ScanKey scankey, OffsetNumber offnum);
 static bool
-			_bt_twostep(IndexScanDesc scan, Buffer * bufP, ScanDirection dir);
+			_bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
 static RetrieveIndexResult
 			_bt_endpoint(IndexScanDesc scan, ScanDirection dir);
 
@@ -49,7 +49,7 @@ static RetrieveIndexResult
  *		calls a recursive-descent search routine on the tree.
  */
 BTStack
-_bt_search(Relation rel, int keysz, ScanKey scankey, Buffer * bufP)
+_bt_search(Relation rel, int keysz, ScanKey scankey, Buffer *bufP)
 {
 	*bufP = _bt_getroot(rel, BT_READ);
 	return (_bt_searchr(rel, keysz, scankey, bufP, (BTStack) NULL));
@@ -62,7 +62,7 @@ static BTStack
 _bt_searchr(Relation rel,
 			int keysz,
 			ScanKey scankey,
-			Buffer * bufP,
+			Buffer *bufP,
 			BTStack stack_in)
 {
 	BTStack		stack;
@@ -1060,7 +1060,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
  *		scan to the right thing.
  */
 bool
-_bt_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir)
+_bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir)
 {
 	Page		page;
 	BTPageOpaque opaque;
@@ -1236,7 +1236,7 @@ _bt_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir)
  *		succeeded, we return true; otherwise, we return false.
  */
 static bool
-_bt_twostep(IndexScanDesc scan, Buffer * bufP, ScanDirection dir)
+_bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir)
 {
 	Page		page;
 	BTPageOpaque opaque;
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index fae0fc27da..5cfc12e8cc 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.21 1997/09/08 02:20:58 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.22 1997/09/08 20:54:28 momjian Exp $
  *
  * NOTES
  *
@@ -72,7 +72,7 @@ extern int	ShowExecutorStats;
 static BTItem _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags);
 static BTItem _bt_minitem(Page opage, BlockNumber oblkno, int atend);
 static void *_bt_pagestate(Relation index, int flags, int level, bool doupper);
-static void _bt_uppershutdown(Relation index, BTPageState * state);
+static void _bt_uppershutdown(Relation index, BTPageState *state);
 
 /*
  * turn on debugging output.
@@ -113,7 +113,7 @@ typedef struct
 	short		bttb_ntup;		/* number of tuples in this block */
 	short		bttb_eor;		/* End-Of-Run marker */
 	char		bttb_data[TAPEBLCKSZ - 2 * sizeof(double)];
-}			BTTapeBlock;
+} BTTapeBlock;
 
 /*
  * this structure holds the bookkeeping for a simple balanced multiway
@@ -129,7 +129,7 @@ typedef struct
 	BTTapeBlock **bts_itape;	/* input tape blocks */
 	BTTapeBlock **bts_otape;	/* output tape blocks */
 	bool		isunique;
-}			BTSpool;
+} BTSpool;
 
 /*-------------------------------------------------------------------------
  * sorting comparison routine - returns {-1,0,1} depending on whether
@@ -154,14 +154,14 @@ typedef struct
 	Datum	   *btsk_datum;
 	char	   *btsk_nulls;
 	BTItem		btsk_item;
-}			BTSortKey;
+} BTSortKey;
 
 static Relation _bt_sortrel;
 static int	_bt_nattr;
 static BTSpool *_bt_inspool;
 
 static void
-_bt_isortcmpinit(Relation index, BTSpool * spool)
+_bt_isortcmpinit(Relation index, BTSpool *spool)
 {
 	_bt_sortrel = index;
 	_bt_inspool = spool;
@@ -169,7 +169,7 @@ _bt_isortcmpinit(Relation index, BTSpool * spool)
 }
 
 static int
-_bt_isortcmp(BTSortKey * k1, BTSortKey * k2)
+_bt_isortcmp(BTSortKey *k1, BTSortKey *k2)
 {
 	Datum	   *k1_datum = k1->btsk_datum;
 	Datum	   *k2_datum = k2->btsk_datum;
@@ -218,7 +218,7 @@ _bt_isortcmp(BTSortKey * k1, BTSortKey * k2)
 }
 
 static void
-_bt_setsortkey(Relation index, BTItem bti, BTSortKey * sk)
+_bt_setsortkey(Relation index, BTItem bti, BTSortKey *sk)
 {
 	sk->btsk_item = (BTItem) NULL;
 	sk->btsk_datum = (Datum *) NULL;
@@ -262,7 +262,7 @@ typedef struct
 {
 	int			btpqe_tape;		/* tape identifier */
 	BTSortKey	btpqe_item;		/* pointer to BTItem in tape buffer */
-}			BTPriQueueElem;
+} BTPriQueueElem;
 
 #define MAXELEM MAXTAPES
 typedef struct
@@ -270,14 +270,14 @@ typedef struct
 	int			btpq_nelem;
 	BTPriQueueElem btpq_queue[MAXELEM];
 	Relation	btpq_rel;
-}			BTPriQueue;
+} BTPriQueue;
 
 /* be sure to call _bt_isortcmpinit first */
 #define GREATER(a, b) \
 	(_bt_isortcmp(&((a)->btpqe_item), &((b)->btpqe_item)) > 0)
 
 static void
-_bt_pqsift(BTPriQueue * q, int parent)
+_bt_pqsift(BTPriQueue *q, int parent)
 {
 	int			child;
 	BTPriQueueElem e;
@@ -308,7 +308,7 @@ _bt_pqsift(BTPriQueue * q, int parent)
 }
 
 static int
-_bt_pqnext(BTPriQueue * q, BTPriQueueElem * e)
+_bt_pqnext(BTPriQueue *q, BTPriQueueElem *e)
 {
 	if (q->btpq_nelem < 1)
 	{							/* already empty */
@@ -326,7 +326,7 @@ _bt_pqnext(BTPriQueue * q, BTPriQueueElem * e)
 }
 
 static void
-_bt_pqadd(BTPriQueue * q, BTPriQueueElem * e)
+_bt_pqadd(BTPriQueue *q, BTPriQueueElem *e)
 {
 	int			child,
 				parent;
@@ -376,7 +376,7 @@ _bt_pqadd(BTPriQueue * q, BTPriQueueElem * e)
  * empty.)
  */
 static void
-_bt_tapereset(BTTapeBlock * tape)
+_bt_tapereset(BTTapeBlock *tape)
 {
 	tape->bttb_eor = 0;
 	tape->bttb_top = 0;
@@ -387,7 +387,7 @@ _bt_tapereset(BTTapeBlock * tape)
  * rewind the physical tape file.
  */
 static void
-_bt_taperewind(BTTapeBlock * tape)
+_bt_taperewind(BTTapeBlock *tape)
 {
 	FileSeek(tape->bttb_fd, 0, SEEK_SET);
 }
@@ -402,7 +402,7 @@ _bt_taperewind(BTTapeBlock * tape)
  * least you don't have to delete and reinsert the directory entries.
  */
 static void
-_bt_tapeclear(BTTapeBlock * tape)
+_bt_tapeclear(BTTapeBlock *tape)
 {
 	/* blow away the contents of the old file */
 	_bt_taperewind(tape);
@@ -444,7 +444,7 @@ _bt_tapecreate(char *fname)
  * destroy the BTTapeBlock structure and its physical tape file.
  */
 static void
-_bt_tapedestroy(BTTapeBlock * tape)
+_bt_tapedestroy(BTTapeBlock *tape)
 {
 	FileUnlink(tape->bttb_fd);
 	pfree((void *) tape);
@@ -454,7 +454,7 @@ _bt_tapedestroy(BTTapeBlock * tape)
  * flush the tape block to the file, marking End-Of-Run if requested.
  */
 static void
-_bt_tapewrite(BTTapeBlock * tape, int eor)
+_bt_tapewrite(BTTapeBlock *tape, int eor)
 {
 	tape->bttb_eor = eor;
 	FileWrite(tape->bttb_fd, (char *) tape, TAPEBLCKSZ);
@@ -472,7 +472,7 @@ _bt_tapewrite(BTTapeBlock * tape, int eor)
  * - 1 if a valid block was read
  */
 static int
-_bt_taperead(BTTapeBlock * tape)
+_bt_taperead(BTTapeBlock *tape)
 {
 	int			fd;
 	int			nread;
@@ -511,7 +511,7 @@ _bt_taperead(BTTapeBlock * tape)
  * - sets 'pos' to the current position within the block.
  */
 static BTItem
-_bt_tapenext(BTTapeBlock * tape, char **pos)
+_bt_tapenext(BTTapeBlock *tape, char **pos)
 {
 	Size		itemsz;
 	BTItem		bti;
@@ -520,7 +520,7 @@ _bt_tapenext(BTTapeBlock * tape, char **pos)
 	{
 		return ((BTItem) NULL);
 	}
-	bti = (BTItem) * pos;
+	bti = (BTItem) *pos;
 	itemsz = BTITEMSZ(bti);
 	*pos += DOUBLEALIGN(itemsz);
 	return (bti);
@@ -538,7 +538,7 @@ _bt_tapenext(BTTapeBlock * tape, char **pos)
  * the beginning of free space.
  */
 static void
-_bt_tapeadd(BTTapeBlock * tape, BTItem item, int itemsz)
+_bt_tapeadd(BTTapeBlock *tape, BTItem item, int itemsz)
 {
 	memcpy(tape->bttb_data + tape->bttb_top, item, itemsz);
 	++tape->bttb_ntup;
@@ -615,7 +615,7 @@ _bt_spooldestroy(void *spool)
  * flush out any dirty output tape blocks
  */
 static void
-_bt_spoolflush(BTSpool * btspool)
+_bt_spoolflush(BTSpool *btspool)
 {
 	int			i;
 
@@ -635,7 +635,7 @@ _bt_spoolflush(BTSpool * btspool)
  * output tapes.
  */
 static void
-_bt_spoolswap(BTSpool * btspool)
+_bt_spoolswap(BTSpool *btspool)
 {
 	File		tmpfd;
 	BTTapeBlock *itape;
@@ -800,7 +800,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
  * allocate a new, clean btree page, not linked to any siblings.
  */
 static void
-_bt_blnewpage(Relation index, Buffer * buf, Page * page, int flags)
+_bt_blnewpage(Relation index, Buffer *buf, Page * page, int flags)
 {
 	BTPageOpaque opaque;
 
@@ -1107,7 +1107,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
 }
 
 static void
-_bt_uppershutdown(Relation index, BTPageState * state)
+_bt_uppershutdown(Relation index, BTPageState *state)
 {
 	BTPageState *s;
 	BlockNumber blkno;
@@ -1158,7 +1158,7 @@ _bt_uppershutdown(Relation index, BTPageState * state)
  * XXX three nested loops?	gross.	cut me up into smaller routines.
  */
 static void
-_bt_merge(Relation index, BTSpool * btspool)
+_bt_merge(Relation index, BTSpool *btspool)
 {
 	BTPageState *state;
 	BTPriQueue	q;
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index 5f1d4846f6..b2c967e585 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.9 1997/09/08 02:21:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.10 1997/09/08 20:54:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,8 @@
 #endif
 
 BOX
-* rt_box_union(BOX * a, BOX * b)
+		   *
+rt_box_union(BOX *a, BOX *b)
 {
 	BOX		   *n;
 
@@ -39,7 +40,7 @@ BOX
 }
 
 BOX		   *
-rt_box_inter(BOX * a, BOX * b)
+rt_box_inter(BOX *a, BOX *b)
 {
 	BOX		   *n;
 
@@ -61,7 +62,7 @@ rt_box_inter(BOX * a, BOX * b)
 }
 
 void
-rt_box_size(BOX * a, float *size)
+rt_box_size(BOX *a, float *size)
 {
 	if (a == (BOX *) NULL || a->high.x <= a->low.x || a->high.y <= a->low.y)
 		*size = 0.0;
@@ -80,7 +81,7 @@ rt_box_size(BOX * a, float *size)
  *		have a special return type for big boxes.
  */
 void
-rt_bigbox_size(BOX * a, float *size)
+rt_bigbox_size(BOX *a, float *size)
 {
 	rt_box_size(a, size);
 }
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 8b1aa533e8..2d18f20540 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.15 1997/09/08 02:21:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.16 1997/09/08 20:54:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,7 +78,7 @@ void
 rtbuild(Relation heap,
 		Relation index,
 		int natts,
-		AttrNumber * attnum,
+		AttrNumber *attnum,
 		IndexStrategy istrat,
 		uint16 pcount,
 		Datum * params,
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 03b82872fd..9d5724fad1 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.11 1997/09/08 02:21:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.12 1997/09/08 20:54:36 momjian Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -273,8 +273,8 @@ TransactionLogUpdate(TransactionId transactionId,		/* trans id to update */
  */
 
 AbsoluteTime					/* commit time of transaction id */
-TransactionIdGetCommitTime(TransactionId transactionId)			/* transaction id to
-																 * test */
+TransactionIdGetCommitTime(TransactionId transactionId) /* transaction id to
+														 * test */
 {
 	BlockNumber blockNumber;
 	AbsoluteTime commitTime;	/* commit time */
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index acdfe93ea9..15645d61b1 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.11 1997/09/08 02:21:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.12 1997/09/08 20:54:37 momjian Exp $
  *
  * NOTES
  *	  This file contains support functions for the high
@@ -61,7 +61,7 @@ void
 TransComputeBlockNumber(Relation relation,		/* relation to test */
 						TransactionId transactionId,	/* transaction id to
 														 * test */
-						BlockNumber * blockNumberOutP)
+						BlockNumber *blockNumberOutP)
 {
 	long		itemsPerBlock = 0;
 
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index f96abbd4cb..ff0c5ef7ba 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.23 1997/09/08 02:21:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.24 1997/09/08 20:54:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1111,7 +1111,7 @@ void
 index_register(char *heap,
 			   char *ind,
 			   int natts,
-			   AttrNumber * attnos,
+			   AttrNumber *attnos,
 			   uint16 nparams,
 			   Datum * params,
 			   FuncIndexInfo * finfo,
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 1fbb505400..4c6c421758 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.26 1997/09/08 02:21:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.27 1997/09/08 20:54:54 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		heap_creatr()			- Create an uncataloged heap relation
@@ -1524,7 +1524,7 @@ pg_plan(char *query_string, Oid * typev, int nargs,
 		QueryTreeList ** queryListP, CommandDest dest);
 
 static void
-StoreAttrDefault(Relation rel, AttrDefault * attrdef)
+StoreAttrDefault(Relation rel, AttrDefault *attrdef)
 {
 	char		str[MAX_PARSE_BUFFER];
 	char		cast[2 * NAMEDATALEN] = {0};
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 5dca2e3d9a..4e36b1ecd6 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.13 1997/09/08 02:21:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.14 1997/09/08 20:55:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -154,7 +154,7 @@ CatalogIndexInsert(Relation * idescs,
 			finfoP = (FuncIndexInfo *) NULL;
 
 		FormIndexDatum(natts,
-					   (AttrNumber *) & pgIndexP->indkey[0],
+					   (AttrNumber *) &pgIndexP->indkey[0],
 					   heapTuple,
 					   heapDescriptor,
 					   InvalidBuffer,
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index d1e1db0cd4..9fa3ad163d 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.31 1997/09/08 02:22:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.32 1997/09/08 20:55:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -775,7 +775,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE * fp, char *delim)
 #endif							/* OMIT_PARTIAL_INDEX */
 					}
 					FormIndexDatum(indexNatts[i],
-							   (AttrNumber *) & (pgIndexP[i]->indkey[0]),
+								(AttrNumber *) &(pgIndexP[i]->indkey[0]),
 								   tuple,
 								   tupDesc,
 								   InvalidBuffer,
diff --git a/src/backend/commands/defind.c b/src/backend/commands/defind.c
index 92bb0e7c09..52f7736b5f 100644
--- a/src/backend/commands/defind.c
+++ b/src/backend/commands/defind.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.14 1997/09/08 02:22:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.15 1997/09/08 20:55:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,10 +46,10 @@ CheckPredExpr(Node * predicate, List * rangeTable,
 static void
 			CheckPredClause(Expr * predicate, List * rangeTable, Oid baseRelOid);
 static void
-FuncIndexArgs(IndexElem * funcIndex, AttrNumber * attNumP,
+FuncIndexArgs(IndexElem * funcIndex, AttrNumber *attNumP,
 			  Oid * argTypes, Oid * opOidP, Oid relId);
 static void
-NormIndexAttrs(List * attList, AttrNumber * attNumP,
+NormIndexAttrs(List * attList, AttrNumber *attNumP,
 			   Oid * opOidP, Oid relId);
 static char *GetDefaultOpClass(Oid atttypid);
 
@@ -422,7 +422,7 @@ CheckPredClause(Expr * predicate, List * rangeTable, Oid baseRelOid)
 
 static void
 FuncIndexArgs(IndexElem * funcIndex,
-			  AttrNumber * attNumP,
+			  AttrNumber *attNumP,
 			  Oid * argTypes,
 			  Oid * opOidP,
 			  Oid relId)
@@ -471,7 +471,7 @@ FuncIndexArgs(IndexElem * funcIndex,
 
 static void
 NormIndexAttrs(List * attList,	/* list of IndexElem's */
-			   AttrNumber * attNumP,
+			   AttrNumber *attNumP,
 			   Oid * opOidP,
 			   Oid relId)
 {
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 5b31866cf2..41f18a8f8b 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.12 1997/09/08 02:22:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.13 1997/09/08 20:55:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -398,7 +398,7 @@ RemoveFunction(char *functionName,		/* function name to be removed */
 			ReleaseBuffer(buffer);
 			bufferUsed = FALSE;
 		}
-		tup = heap_getnext(scan, 0, (Buffer *) & buffer);
+		tup = heap_getnext(scan, 0, (Buffer *) &buffer);
 		if (!HeapTupleIsValid(tup))
 			break;
 		bufferUsed = TRUE;
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 3f5bc37163..82c3deaf64 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -61,7 +61,7 @@ typedef SeqTableData *SeqTable;
 static SeqTable seqtab = NULL;
 
 static SeqTable init_sequence(char *caller, char *name);
-static SequenceTupleForm read_info(char *caller, SeqTable elm, Buffer * buf);
+static SequenceTupleForm read_info(char *caller, SeqTable elm, Buffer *buf);
 static void init_params(CreateSeqStmt * seq, SequenceTupleForm new);
 static int	get_param(DefElem * def);
 
@@ -323,7 +323,7 @@ currval(struct varlena * seqin)
 }
 
 static SequenceTupleForm
-read_info(char *caller, SeqTable elm, Buffer * buf)
+read_info(char *caller, SeqTable elm, Buffer *buf)
 {
 	ItemPointerData iptr;
 	PageHeader	page;
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 66fbbd5db2..1bd08c8a3f 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.44 1997/09/08 02:22:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.45 1997/09/08 20:55:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1224,7 +1224,7 @@ failed to add item with len = %u to page %u (free space %u, nusd %u, noff %u)",
 				{
 					FormIndexDatum(
 								   idcur->natts,
-							  (AttrNumber *) & (idcur->tform->indkey[0]),
+							   (AttrNumber *) &(idcur->tform->indkey[0]),
 								   newtup,
 								   tupdesc,
 								   InvalidBuffer,
@@ -1949,7 +1949,7 @@ vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats * vacrels
 				if (VacAttrStatsLtGtValid(stats) && stats->initialized	/* &&
 																		 * !IsSystemRelationName(
 																		 *
-						pgcform->relname.data) */ )
+					 pgcform->relname.data) */ )
 				{
 					func_ptr	out_function;
 					char	   *out_string;
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index a1e0140265..8248c8f5c3 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.14 1997/09/08 02:22:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.15 1997/09/08 20:55:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,9 +69,9 @@ bool		execConstByVal;
 int			execConstLen;
 
 /* static functions decls */
-static Datum ExecEvalAggreg(Aggreg * agg, ExprContext * econtext, bool * isNull);
+static Datum ExecEvalAggreg(Aggreg *agg, ExprContext * econtext, bool * isNull);
 static Datum
-ExecEvalArrayRef(ArrayRef * arrayRef, ExprContext * econtext,
+ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext * econtext,
 				 bool * isNull, bool * isDone);
 static Datum ExecEvalAnd(Expr * andExpr, ExprContext * econtext, bool * isNull);
 static Datum
@@ -101,7 +101,7 @@ static bool ExecQualClause(Node * clause, ExprContext * econtext);
  * --------------------------------
  */
 static Datum
-ExecEvalArrayRef(ArrayRef * arrayRef,
+ExecEvalArrayRef(ArrayRef *arrayRef,
 				 ExprContext * econtext,
 				 bool * isNull,
 				 bool * isDone)
@@ -200,7 +200,7 @@ ExecEvalArrayRef(ArrayRef * arrayRef,
  * ----------------------------------------------------------------
  */
 static Datum
-ExecEvalAggreg(Aggreg * agg, ExprContext * econtext, bool * isNull)
+ExecEvalAggreg(Aggreg *agg, ExprContext * econtext, bool * isNull)
 {
 
 	*isNull = econtext->ecxt_nulls[agg->aggno];
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 0f3338d3cb..8d87e8591a 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.16 1997/09/08 02:22:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.17 1997/09/08 20:55:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,7 +60,7 @@
 
 static void
 ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP,
-					AttrNumber ** attsOutP, FuncIndexInfoPtr fInfoP);
+					AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP);
 
 /* ----------------------------------------------------------------
  *		global counters for number of tuples processed, retrieved,
@@ -608,7 +608,7 @@ QueryDescGetTypeInfo(QueryDesc * queryDesc)
 static void
 ExecGetIndexKeyInfo(IndexTupleForm indexTuple,
 					int *numAttsOutP,
-					AttrNumber ** attsOutP,
+					AttrNumber **attsOutP,
 					FuncIndexInfoPtr fInfoP)
 {
 	int			i;
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 92fa9bbe1e..71646b67e0 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -45,9 +45,9 @@ typedef struct AggFuncInfo
 	int			xfn1_nargs;
 	int			xfn2_nargs;
 	int			finalfn_nargs;
-}			AggFuncInfo;
+} AggFuncInfo;
 
-static Datum aggGetAttr(TupleTableSlot * tuple, Aggreg * agg, bool * isNull);
+static Datum aggGetAttr(TupleTableSlot * tuple, Aggreg *agg, bool * isNull);
 
 
 /* ---------------------------------------
@@ -88,7 +88,7 @@ static Datum aggGetAttr(TupleTableSlot * tuple, Aggreg * agg, bool * isNull);
  * ------------------------------------------
  */
 TupleTableSlot *
-ExecAgg(Agg * node)
+ExecAgg(Agg *node)
 {
 	AggState   *aggstate;
 	EState	   *estate;
@@ -488,7 +488,7 @@ ExecAgg(Agg * node)
  * -----------------
  */
 bool
-ExecInitAgg(Agg * node, EState * estate, Plan * parent)
+ExecInitAgg(Agg *node, EState * estate, Plan * parent)
 {
 	AggState   *aggstate;
 	Plan	   *outerPlan;
@@ -551,7 +551,7 @@ ExecInitAgg(Agg * node, EState * estate, Plan * parent)
 }
 
 int
-ExecCountSlotsAgg(Agg * node)
+ExecCountSlotsAgg(Agg *node)
 {
 	return ExecCountSlotsNode(outerPlan(node)) +
 	ExecCountSlotsNode(innerPlan(node)) +
@@ -564,7 +564,7 @@ ExecCountSlotsAgg(Agg * node)
  * -----------------------
  */
 void
-ExecEndAgg(Agg * node)
+ExecEndAgg(Agg *node)
 {
 	AggState   *aggstate;
 	Plan	   *outerPlan;
@@ -592,7 +592,7 @@ ExecEndAgg(Agg * node)
  */
 static Datum
 aggGetAttr(TupleTableSlot * slot,
-		   Aggreg * agg,
+		   Aggreg *agg,
 		   bool * isNull)
 {
 	Datum		result;
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index da43dc8ee3..786c93c719 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.7 1997/09/08 02:22:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.8 1997/09/08 20:55:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,7 +64,7 @@
 #include "utils/mcxt.h"
 #include "parser/parsetree.h"	/* for rt_store() macro */
 
-static bool exec_append_initialize_next(Append * node);
+static bool exec_append_initialize_next(Append *node);
 
 /* ----------------------------------------------------------------
  *		exec-append-initialize-next
@@ -76,7 +76,7 @@ static bool exec_append_initialize_next(Append * node);
  * ----------------------------------------------------------------
  */
 static bool
-exec_append_initialize_next(Append * node)
+exec_append_initialize_next(Append *node)
 {
 	EState	   *estate;
 	AppendState *unionstate;
@@ -182,7 +182,7 @@ exec_append_initialize_next(Append * node)
  * ----------------------------------------------------------------
  */
 bool
-ExecInitAppend(Append * node, EState * estate, Plan * parent)
+ExecInitAppend(Append *node, EState * estate, Plan * parent)
 {
 	AppendState *unionstate;
 	int			nplans;
@@ -341,7 +341,7 @@ ExecInitAppend(Append * node, EState * estate, Plan * parent)
 }
 
 int
-ExecCountSlotsAppend(Append * node)
+ExecCountSlotsAppend(Append *node)
 {
 	List	   *plan;
 	List	   *unionplans = node->unionplans;
@@ -363,7 +363,7 @@ ExecCountSlotsAppend(Append * node)
  * ----------------------------------------------------------------
  */
 TupleTableSlot *
-ExecProcAppend(Append * node)
+ExecProcAppend(Append *node)
 {
 	EState	   *estate;
 	AppendState *unionstate;
@@ -456,7 +456,7 @@ ExecProcAppend(Append * node)
  * ----------------------------------------------------------------
  */
 void
-ExecEndAppend(Append * node)
+ExecEndAppend(Append *node)
 {
 	AppendState *unionstate;
 	int			nplans;
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index c7e63696c0..4e9ab4cfc8 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -13,7 +13,7 @@
  *	  columns. (ie. tuples from the same group are consecutive)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.7 1997/09/08 02:22:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.8 1997/09/08 20:55:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,7 +32,7 @@ static TupleTableSlot *ExecGroupEveryTuple(Group * node);
 static TupleTableSlot *ExecGroupOneTuple(Group * node);
 static bool
 sameGroup(TupleTableSlot * oldslot, TupleTableSlot * newslot,
-		  int numCols, AttrNumber * grpColIdx, TupleDesc tupdesc);
+		  int numCols, AttrNumber *grpColIdx, TupleDesc tupdesc);
 
 /* ---------------------------------------
  *	 ExecGroup -
@@ -383,7 +383,7 @@ static bool
 sameGroup(TupleTableSlot * oldslot,
 		  TupleTableSlot * newslot,
 		  int numCols,
-		  AttrNumber * grpColIdx,
+		  AttrNumber *grpColIdx,
 		  TupleDesc tupdesc)
 {
 	bool		isNull1,
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 621cfcea90..54c085b1d6 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.10 1997/09/08 02:22:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.11 1997/09/08 20:55:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -734,8 +734,7 @@ ExecMergeJoin(MergeJoin * node)
 				 * This is the case when
 				 *
 				 * outer inner 4	 5	- marked tuple outer tuple -  5		5
-				 * new outer tuple -  5		5 6		8  - inner tuple 7
-				 * 12
+				 * new outer tuple -  5		5 6		8  - inner tuple 7 12
 				 *
 				 * new outer tuple = marked tuple
 				 *
@@ -750,7 +749,8 @@ ExecMergeJoin(MergeJoin * node)
 				 *
 				 * new outer tuple > marked tuple
 				 *
-				*******************************
+				******************************
+				 *
 				 *
 				 *
 				 */
@@ -830,7 +830,8 @@ ExecMergeJoin(MergeJoin * node)
 				 * we have to advance the outer scan until we find the outer
 				 * 8.
 				 *
-				*******************************
+				******************************
+				 *
 				 *
 				 *
 				 */
@@ -932,7 +933,8 @@ ExecMergeJoin(MergeJoin * node)
 				 * we have to advance the inner scan until we find the inner
 				 * 12.
 				 *
-				*******************************
+				******************************
+				 *
 				 *
 				 *
 				 */
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index d8d5f38d6d..fe6123a0aa 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.5 1997/09/08 02:22:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.6 1997/09/08 20:55:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -86,7 +86,7 @@ ExecNestLoop(NestLoop * node, Plan * parent)
 	 */
 	econtext = nlstate->jstate.cs_ExprContext;
 
-	/* ----------------		* get the current outer tuple
+	/* ----------------		  * get the current outer tuple
 	 * ----------------
 	 */
 	outerTupleSlot = nlstate->jstate.cs_OuterTupleSlot;
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index d710ab711c..36ed7e86eb 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.8 1997/09/08 02:23:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.9 1997/09/08 20:55:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -157,7 +157,7 @@ _copyResult(Result * from)
  * ----------------
  */
 static Append *
-_copyAppend(Append * from)
+_copyAppend(Append *from)
 {
 	Append	   *newnode = makeNode(Append);
 
@@ -486,7 +486,7 @@ _copySort(Sort * from)
  * --------------
  */
 static Agg *
-_copyAgg(Agg * from)
+_copyAgg(Agg *from)
 {
 	Agg		   *newnode = makeNode(Agg);
 	int			i;
@@ -870,7 +870,7 @@ _copyFunc(Func * from)
  * ----------------
  */
 static Aggreg *
-_copyAggreg(Aggreg * from)
+_copyAggreg(Aggreg *from)
 {
 	Aggreg	   *newnode = makeNode(Aggreg);
 
@@ -890,7 +890,7 @@ _copyAggreg(Aggreg * from)
 }
 
 static Array *
-_copyArray(Array * from)
+_copyArray(Array *from)
 {
 	Array	   *newnode = makeNode(Array);
 
@@ -910,7 +910,7 @@ _copyArray(Array * from)
 }
 
 static ArrayRef *
-_copyArrayRef(ArrayRef * from)
+_copyArrayRef(ArrayRef *from)
 {
 	ArrayRef   *newnode = makeNode(ArrayRef);
 
@@ -1479,7 +1479,7 @@ _copySortClause(SortClause * from)
 }
 
 static A_Const *
-_copyAConst(A_Const * from)
+_copyAConst(A_Const *from)
 {
 	A_Const    *newnode = makeNode(A_Const);
 
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 21958ca293..3500a638ce 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.8 1997/09/08 02:23:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.9 1997/09/08 20:55:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -138,7 +138,7 @@ _equalVar(Var * a, Var * b)
 }
 
 static bool
-_equalArray(Array * a, Array * b)
+_equalArray(Array *a, Array *b)
 {
 	if (a->arrayelemtype != b->arrayelemtype)
 		return (false);
@@ -154,7 +154,7 @@ _equalArray(Array * a, Array * b)
 }
 
 static bool
-_equalArrayRef(ArrayRef * a, ArrayRef * b)
+_equalArrayRef(ArrayRef *a, ArrayRef *b)
 {
 	if (a->refelemtype != b->refelemtype)
 		return (false);
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 30c0ff9a6e..9b6840ecb6 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.8 1997/09/08 02:23:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.9 1997/09/08 20:55:56 momjian Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -186,7 +186,7 @@ _outExistential(StringInfo str, Existential * node)
  *	Append is a subclass of Plan.
  */
 static void
-_outAppend(StringInfo str, Append * node)
+_outAppend(StringInfo str, Append *node)
 {
 	char		buf[500];
 
@@ -387,7 +387,7 @@ _outSort(StringInfo str, Sort * node)
 }
 
 static void
-_outAgg(StringInfo str, Agg * node)
+_outAgg(StringInfo str, Agg *node)
 {
 	char		buf[500];
 
@@ -646,7 +646,7 @@ _outConst(StringInfo str, Const * node)
  *	Aggreg
  */
 static void
-_outAggreg(StringInfo str, Aggreg * node)
+_outAggreg(StringInfo str, Aggreg *node)
 {
 	char		buf[500];
 
@@ -670,7 +670,7 @@ _outAggreg(StringInfo str, Aggreg * node)
  *	Array is a subclass of Expr
  */
 static void
-_outArray(StringInfo str, Array * node)
+_outArray(StringInfo str, Array *node)
 {
 	char		buf[500];
 	int			i;
@@ -707,7 +707,7 @@ _outArray(StringInfo str, Array * node)
  *	ArrayRef is a subclass of Expr
  */
 static void
-_outArrayRef(StringInfo str, ArrayRef * node)
+_outArrayRef(StringInfo str, ArrayRef *node)
 {
 	char		buf[500];
 
diff --git a/src/backend/optimizer/path/predmig.c b/src/backend/optimizer/path/predmig.c
index f1990e13a0..75c131a244 100644
--- a/src/backend/optimizer/path/predmig.c
+++ b/src/backend/optimizer/path/predmig.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.4 1997/09/08 02:24:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.5 1997/09/08 20:56:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,7 +78,7 @@ static int	xfunc_stream_compare(void *arg1, void *arg2);
 static bool xfunc_check_stream(Stream node);
 static bool xfunc_in_stream(Stream node, Stream stream);
 
-/* -----------------	   MAIN FUNCTIONS		------------------------ */
+/* -----------------	 MAIN FUNCTIONS		  ------------------------ */
 /*
 ** xfunc_do_predmig
 **	  wrapper for Predicate Migration.	It calls xfunc_predmig until no
@@ -495,7 +495,7 @@ xfunc_form_groups(Query * queryInfo, Stream root, Stream bottom)
 }
 
 
-/* -------------------	 UTILITY FUNCTIONS	   ------------------------- */
+/* -------------------	   UTILITY FUNCTIONS	 ------------------------- */
 
 /*
  ** xfunc_free_stream --
@@ -765,7 +765,7 @@ xfunc_stream_compare(void *arg1, void *arg2)
 	}
 }
 
-/* ------------------	 DEBUGGING ROUTINES		---------------------------- */
+/* ------------------  DEBUGGING ROUTINES	  ---------------------------- */
 
 /*
  ** Make sure all pointers in stream make sense.  Make sure no joins are
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 413389f475..310bb528f4 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.13 1997/09/08 02:24:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.14 1997/09/08 20:56:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1113,7 +1113,7 @@ make_material(List * tlist,
 }
 
 Agg		   *
-make_agg(List * tlist, int nagg, Aggreg ** aggs)
+make_agg(List * tlist, int nagg, Aggreg **aggs)
 {
 	Agg		   *node = makeNode(Agg);
 
@@ -1133,7 +1133,7 @@ Group	   *
 make_group(List * tlist,
 		   bool tuplePerGroup,
 		   int ngrp,
-		   AttrNumber * grpColIdx,
+		   AttrNumber *grpColIdx,
 		   Sort * lefttree)
 {
 	Group	   *node = makeNode(Group);
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 5a6e4da344..bc4e8cdbe6 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.6 1997/09/08 02:24:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.7 1997/09/08 20:56:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -686,7 +686,7 @@ OperandIsInner(Node * opnd, int inner_relid)
  *
  */
 void
-set_agg_tlist_references(Agg * aggNode)
+set_agg_tlist_references(Agg *aggNode)
 {
 	List	   *aggTargetList;
 	List	   *subplanTargetList;
@@ -704,7 +704,7 @@ set_agg_tlist_references(Agg * aggNode)
 }
 
 void
-set_agg_agglist_references(Agg * aggNode)
+set_agg_agglist_references(Agg *aggNode)
 {
 	List	   *subplanTargetList;
 	Aggreg	  **aggs;
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 17a97a55ee..520b745667 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.9 1997/09/08 02:24:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.10 1997/09/08 20:56:19 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -597,7 +597,7 @@ fix_opids(List * clauses)
 void
 get_relattval(Node * clause,
 			  int *relid,
-			  AttrNumber * attno,
+			  AttrNumber *attno,
 			  Datum * constval,
 			  int *flag)
 {
@@ -728,9 +728,9 @@ get_relattval(Node * clause,
 void
 get_rels_atts(Node * clause,
 			  int *relid1,
-			  AttrNumber * attno1,
+			  AttrNumber *attno1,
 			  int *relid2,
-			  AttrNumber * attno2)
+			  AttrNumber *attno2)
 {
 	Var		   *left = get_leftop((Expr *) clause);
 	Var		   *right = get_rightop((Expr *) clause);
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index c796c74b1a..21af940209 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.40 1997/09/08 02:25:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.41 1997/09/08 20:56:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,14 +47,14 @@
 static Query *transformStmt(ParseState * pstate, Node * stmt);
 
 static Query *transformDeleteStmt(ParseState * pstate, DeleteStmt * stmt);
-static Query *transformInsertStmt(ParseState * pstate, AppendStmt * stmt);
+static Query *transformInsertStmt(ParseState * pstate, AppendStmt *stmt);
 static Query *transformIndexStmt(ParseState * pstate, IndexStmt * stmt);
 static Query *transformExtendStmt(ParseState * pstate, ExtendStmt * stmt);
 static Query *transformRuleStmt(ParseState * query, RuleStmt * stmt);
 static Query *transformSelectStmt(ParseState * pstate, RetrieveStmt * stmt);
 static Query *transformUpdateStmt(ParseState * pstate, ReplaceStmt * stmt);
 static Query *transformCursorStmt(ParseState * pstate, CursorStmt * stmt);
-static Node *handleNestedDots(ParseState * pstate, Attr * attr, int *curr_resno);
+static Node *handleNestedDots(ParseState * pstate, Attr *attr, int *curr_resno);
 
 #define EXPR_COLUMN_FIRST	 1
 #define EXPR_RELATION_FIRST  2
@@ -89,7 +89,7 @@ static List *setup_base_tlist(Oid typeid);
 static void
 make_arguments(int nargs, List * fargs, Oid * input_typeids,
 			   Oid * function_typeids);
-static void AddAggToParseState(ParseState * pstate, Aggreg * aggreg);
+static void AddAggToParseState(ParseState * pstate, Aggreg *aggreg);
 static void finalizeAggregates(ParseState * pstate, Query * qry);
 static void parseCheckAggregates(ParseState * pstate, Query * qry);
 static ParseState *makeParseState(void);
@@ -300,7 +300,7 @@ transformDeleteStmt(ParseState * pstate, DeleteStmt * stmt)
  *	  transform an Insert Statement
  */
 static Query *
-transformInsertStmt(ParseState * pstate, AppendStmt * stmt)
+transformInsertStmt(ParseState * pstate, AppendStmt *stmt)
 {
 	Query	   *qry = makeNode(Query);	/* make a new query tree */
 
@@ -1872,7 +1872,7 @@ transformSortClause(ParseState * pstate,
  ** a tree with of Iter and Func nodes.
  */
 static Node *
-handleNestedDots(ParseState * pstate, Attr * attr, int *curr_resno)
+handleNestedDots(ParseState * pstate, Attr *attr, int *curr_resno)
 {
 	List	   *mutator_iter;
 	Node	   *retval = NULL;
@@ -2524,7 +2524,7 @@ ParseFunc(ParseState * pstate, char *funcname, List * fargs, int *curr_resno)
  * SIDE EFFECT: aggno in target list entry will be modified
  */
 static void
-AddAggToParseState(ParseState * pstate, Aggreg * aggreg)
+AddAggToParseState(ParseState * pstate, Aggreg *aggreg)
 {
 	List	   *ag;
 	int			i;
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 998a087d25..d6c53d2ee2 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.55 1997/09/08 02:27:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.56 1997/09/08 20:56:38 momjian Exp $
  *
  * NOTES
  *
@@ -112,7 +112,7 @@
 typedef struct bkend
 {
 	int			pid;			/* process id of backend */
-}			Backend;
+} Backend;
 
 /* list of active backends.  For garbage collection only now. */
 
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index 1fc31580a5..b384963101 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.6 1997/09/08 02:28:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.7 1997/09/08 20:56:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -101,7 +101,7 @@ BufTableLookup(BufferTag * tagPtr)
  * BufTableDelete
  */
 bool
-BufTableDelete(BufferDesc * buf)
+BufTableDelete(BufferDesc *buf)
 {
 	LookupEnt  *result;
 	bool		found;
@@ -130,7 +130,7 @@ BufTableDelete(BufferDesc * buf)
 }
 
 bool
-BufTableInsert(BufferDesc * buf)
+BufTableInsert(BufferDesc *buf)
 {
 	LookupEnt  *result;
 	bool		found;
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 4e7ff8c967..cdd4909cad 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.21 1997/09/08 02:28:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.22 1997/09/08 20:56:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,10 +80,10 @@ extern long int LocalBufferFlushCount;
 static int	WriteMode = BUFFER_LATE_WRITE;		/* Delayed write is
 												 * default */
 
-static void WaitIO(BufferDesc * buf, SPINLOCK spinlock);
+static void WaitIO(BufferDesc *buf, SPINLOCK spinlock);
 
 #ifndef HAS_TEST_AND_SET
-static void SignalIO(BufferDesc * buf);
+static void SignalIO(BufferDesc *buf);
 extern long *NWaitIOBackendP;	/* defined in buf_init.c */
 
 #endif							/* HAS_TEST_AND_SET */
@@ -96,7 +96,7 @@ BufferAlloc(Relation reln, BlockNumber blockNum,
 			bool * foundPtr, bool bufferLockHeld);
 static int	FlushBuffer(Buffer buffer, bool release);
 static void BufferSync(void);
-static int	BufferReplace(BufferDesc * bufHdr, bool bufferLockHeld);
+static int	BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld);
 
 /* ---------------------------------------------------
  * RelationGetBufferWithBuffer
@@ -1105,7 +1105,7 @@ BufferSync()
  */
 #ifdef HAS_TEST_AND_SET
 static void
-WaitIO(BufferDesc * buf, SPINLOCK spinlock)
+WaitIO(BufferDesc *buf, SPINLOCK spinlock)
 {
 	SpinRelease(spinlock);
 	S_LOCK(&(buf->io_in_progress_lock));
@@ -1117,7 +1117,7 @@ WaitIO(BufferDesc * buf, SPINLOCK spinlock)
 IpcSemaphoreId WaitIOSemId;
 
 static void
-WaitIO(BufferDesc * buf, SPINLOCK spinlock)
+WaitIO(BufferDesc *buf, SPINLOCK spinlock)
 {
 	bool		inProgress;
 
@@ -1139,7 +1139,7 @@ WaitIO(BufferDesc * buf, SPINLOCK spinlock)
  * SignalIO --
  */
 static void
-SignalIO(BufferDesc * buf)
+SignalIO(BufferDesc *buf)
 {
 	/* somebody better be waiting. */
 	Assert(buf->refcount > 1);
@@ -1346,7 +1346,7 @@ BufferGetRelation(Buffer buffer)
  *
  */
 static int
-BufferReplace(BufferDesc * bufHdr, bool bufferLockHeld)
+BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld)
 {
 	Relation	reln;
 	Oid			bufdb,
@@ -1410,8 +1410,8 @@ BlockNumber
 RelationGetNumberOfBlocks(Relation relation)
 {
 	return
-		((relation->rd_islocal) ? relation->rd_nblocks :
-		 smgrnblocks(relation->rd_rel->relsmgr, relation));
+	((relation->rd_islocal) ? relation->rd_nblocks :
+	 smgrnblocks(relation->rd_rel->relsmgr, relation));
 }
 
 /*
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 027a6a9467..b2f9fd7e9a 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.6 1997/09/08 02:28:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.7 1997/09/08 20:56:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -59,7 +59,7 @@ extern SPINLOCK BufMgrLock;
  * Currently, they are added on an LRU basis.
  */
 void
-AddBufferToFreelist(BufferDesc * bf)
+AddBufferToFreelist(BufferDesc *bf)
 {
 #ifdef BMTRACE
 	_bm_trace(bf->tag.relId.dbId, bf->tag.relId.relId, bf->tag.blockNum,
@@ -82,7 +82,7 @@ AddBufferToFreelist(BufferDesc * bf)
  * PinBuffer -- make buffer unavailable for replacement.
  */
 void
-PinBuffer(BufferDesc * buf)
+PinBuffer(BufferDesc *buf)
 {
 	long		b;
 
@@ -114,7 +114,7 @@ PinBuffer(BufferDesc * buf)
 
 #ifdef NOT_USED
 void
-PinBuffer_Debug(char *file, int line, BufferDesc * buf)
+PinBuffer_Debug(char *file, int line, BufferDesc *buf)
 {
 	PinBuffer(buf);
 	if (ShowPinTrace)
@@ -136,7 +136,7 @@ refcount = %ld, file: %s, line: %d\n",
  * UnpinBuffer -- make buffer available for replacement.
  */
 void
-UnpinBuffer(BufferDesc * buf)
+UnpinBuffer(BufferDesc *buf)
 {
 	long		b = BufferDescriptorGetBuffer(buf) - 1;
 
@@ -160,7 +160,7 @@ UnpinBuffer(BufferDesc * buf)
 
 #ifdef NOT_USED
 void
-UnpinBuffer_Debug(char *file, int line, BufferDesc * buf)
+UnpinBuffer_Debug(char *file, int line, BufferDesc *buf)
 {
 	UnpinBuffer(buf);
 	if (ShowPinTrace)
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index bacd56b454..38cf0b4799 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.15 1997/09/08 02:29:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.16 1997/09/08 20:56:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,7 +66,7 @@
 static HeapTuple
 inv_newtuple(LargeObjectDesc * obj_desc, Buffer buffer,
 			 Page page, char *dbuf, int nwrite);
-static HeapTuple inv_fetchtup(LargeObjectDesc * obj_desc, Buffer * bufP);
+static HeapTuple inv_fetchtup(LargeObjectDesc * obj_desc, Buffer *bufP);
 static int	inv_wrnew(LargeObjectDesc * obj_desc, char *buf, int nbytes);
 static int
 inv_wrold(LargeObjectDesc * obj_desc, char *dbuf, int nbytes,
@@ -576,7 +576,7 @@ inv_write(LargeObjectDesc * obj_desc, char *buf, int nbytes)
  *				such tuple exists.
  */
 static HeapTuple
-inv_fetchtup(LargeObjectDesc * obj_desc, Buffer * bufP)
+inv_fetchtup(LargeObjectDesc * obj_desc, Buffer *bufP)
 {
 	HeapTuple	htup;
 	RetrieveIndexResult res;
@@ -1035,7 +1035,7 @@ inv_newtuple(LargeObjectDesc * obj_desc,
 	 * *  mer fixed disk layout of varlenas to get rid of the need for
 	 * this. *
 	 *
-	 *((int32 *) attptr) = nwrite + sizeof(int32); *  attptr +=
+	 * ((int32 *) attptr) = nwrite + sizeof(int32); *  attptr +=
 	 * sizeof(int32);
 	 */
 
diff --git a/src/backend/tcop/aclchk.c b/src/backend/tcop/aclchk.c
index a12c544e2e..0e66b0c857 100644
--- a/src/backend/tcop/aclchk.c
+++ b/src/backend/tcop/aclchk.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.15 1997/09/08 02:29:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.16 1997/09/08 20:56:53 momjian Exp $
  *
  * NOTES
  *	  See acl.h.
@@ -36,7 +36,7 @@
 #include "parser/catalog_utils.h"
 #include "fmgr.h"
 
-static int32 aclcheck(Acl * acl, AclId id, AclIdType idtype, AclMode mode);
+static int32 aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode);
 
 /*
  * Enable use of user relations in place of real system catalogs.
@@ -69,7 +69,7 @@ char	   *aclcheck_error_strings[] = {
 
 #ifdef ACLDEBUG_TRACE
 static
-dumpacl(Acl * acl)
+dumpacl(Acl *acl)
 {
 	register unsigned i;
 	AclItem    *aip;
@@ -88,7 +88,7 @@ dumpacl(Acl * acl)
  */
 void
 ChangeAcl(char *relname,
-		  AclItem * mod_aip,
+		  AclItem *mod_aip,
 		  unsigned modechg)
 {
 	register unsigned i;
@@ -277,7 +277,7 @@ in_group(AclId uid, AclId gid)
  * any one of the requirements of 'mode'.  Returns 0 otherwise.
  */
 static int32
-aclcheck(Acl * acl, AclId id, AclIdType idtype, AclMode mode)
+aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
 {
 	register unsigned i;
 	register AclItem *aip,
diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h
index ba4f9d0bad..8dc0292061 100644
--- a/src/backend/tioga/tgRecipe.h
+++ b/src/backend/tioga/tgRecipe.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tgRecipe.h,v 1.3 1997/09/08 02:30:12 momjian Exp $
+ * $Id: tgRecipe.h,v 1.4 1997/09/08 20:57:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@ typedef struct
 				y;
 }			Point;				/* this should match whatever is in
 
+								 *
 								 *
 								 * geo-decls.h */
 
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index d0acb4c694..e1a2db85ff 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.15 1997/09/08 02:30:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.16 1997/09/08 20:57:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,9 @@
 #include "miscadmin.h"
 
 static char *getid(char *s, char *n);
-static int32 aclitemeq(AclItem * a1, AclItem * a2);
-static int32 aclitemgt(AclItem * a1, AclItem * a2);
-static char *aclparse(char *s, AclItem * aip, unsigned *modechg);
+static int32 aclitemeq(AclItem *a1, AclItem *a2);
+static int32 aclitemgt(AclItem *a1, AclItem *a2);
+static char *aclparse(char *s, AclItem *aip, unsigned *modechg);
 
 #define ACL_IDTYPE_GID_KEYWORD	"group"
 #define ACL_IDTYPE_UID_KEYWORD	"user"
@@ -83,7 +83,7 @@ getid(char *s, char *n)
  *		- loads 'modechg' with the mode change flag.
  */
 static char *
-aclparse(char *s, AclItem * aip, unsigned *modechg)
+aclparse(char *s, AclItem *aip, unsigned *modechg)
 {
 	HeapTuple	htp;
 	char		name[NAMEDATALEN];
@@ -240,7 +240,7 @@ aclitemin(char *s)
  *		the new string
  */
 char	   *
-aclitemout(AclItem * aip)
+aclitemout(AclItem *aip)
 {
 	register char *p;
 	char	   *out;
@@ -312,7 +312,7 @@ aclitemout(AclItem * aip)
  *		a boolean value indicating = or >
  */
 static int32
-aclitemeq(AclItem * a1, AclItem * a2)
+aclitemeq(AclItem *a1, AclItem *a2)
 {
 	if (!a1 && !a2)
 		return (1);
@@ -322,7 +322,7 @@ aclitemeq(AclItem * a1, AclItem * a2)
 }
 
 static int32
-aclitemgt(AclItem * a1, AclItem * a2)
+aclitemgt(AclItem *a1, AclItem *a2)
 {
 	if (a1 && !a2)
 		return (1);
@@ -364,7 +364,7 @@ acldefault(void)
 }
 
 Acl		   *
-aclinsert3(Acl * old_acl, AclItem * mod_aip, unsigned modechg)
+aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg)
 {
 	Acl		   *new_acl;
 	AclItem    *old_aip,
@@ -481,13 +481,13 @@ aclinsert3(Acl * old_acl, AclItem * mod_aip, unsigned modechg)
  *
  */
 Acl		   *
-aclinsert(Acl * old_acl, AclItem * mod_aip)
+aclinsert(Acl *old_acl, AclItem *mod_aip)
 {
 	return (aclinsert3(old_acl, mod_aip, ACL_MODECHG_EQL));
 }
 
 Acl		   *
-aclremove(Acl * old_acl, AclItem * mod_aip)
+aclremove(Acl *old_acl, AclItem *mod_aip)
 {
 	Acl		   *new_acl;
 	AclItem    *old_aip,
@@ -547,7 +547,7 @@ aclremove(Acl * old_acl, AclItem * mod_aip)
 }
 
 int32
-aclcontains(Acl * acl, AclItem * aip)
+aclcontains(Acl *acl, AclItem *aip)
 {
 	unsigned	i,
 				num;
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 15a6031179..7b1cb869a9 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.17 1997/09/08 02:30:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.18 1997/09/08 20:57:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -70,14 +70,14 @@ static char *_AdvanceBy1word(char *str, char **word);
 #endif
 static void
 _ArrayRange(int st[], int endp[], int bsize, char *destPtr,
-			ArrayType * array, int from);
-static int	_ArrayClipCount(int stI[], int endpI[], ArrayType * array);
+			ArrayType *array, int from);
+static int	_ArrayClipCount(int stI[], int endpI[], ArrayType *array);
 static void
 _LOArrayRange(int st[], int endp[], int bsize, int srcfd,
-			  int destfd, ArrayType * array, int isSrcLO, bool * isNull);
+			  int destfd, ArrayType *array, int isSrcLO, bool * isNull);
 static void
 _ReadArray(int st[], int endp[], int bsize, int srcfd, int destfd,
-		   ArrayType * array, int isDestLO, bool * isNull);
+		   ArrayType *array, int isDestLO, bool * isNull);
 static ArrayCastAndSet(char *src, bool typbyval, int typlen, char *dest);
 static SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]);
 static int	array_read(char *destptr, int eltsize, int nitems, char *srcptr);
@@ -613,7 +613,7 @@ _CopyArrayEls(char **values,
  *-------------------------------------------------------------------------
  */
 char	   *
-array_out(ArrayType * v, Oid element_type)
+array_out(ArrayType *v, Oid element_type)
 {
 	int			typlen;
 	bool		typbyval;
@@ -771,7 +771,7 @@ array_out(ArrayType * v, Oid element_type)
  *----------------------------------------------------------------------------
  */
 char	   *
-array_dims(ArrayType * v, bool * isNull)
+array_dims(ArrayType *v, bool * isNull)
 {
 	char	   *p,
 			   *save_p;
@@ -810,7 +810,7 @@ array_dims(ArrayType * v, bool * isNull)
  *---------------------------------------------------------------------------
  */
 Datum
-array_ref(ArrayType * array,
+array_ref(ArrayType *array,
 		  int n,
 		  int indx[],
 		  int reftype,
@@ -931,7 +931,7 @@ array_ref(ArrayType * array,
  *-----------------------------------------------------------------------------
  */
 Datum
-array_clip(ArrayType * array,
+array_clip(ArrayType *array,
 		   int n,
 		   int upperIndx[],
 		   int lowerIndx[],
@@ -1073,7 +1073,7 @@ array_clip(ArrayType * array,
  *-----------------------------------------------------------------------------
  */
 char	   *
-array_set(ArrayType * array,
+array_set(ArrayType *array,
 		  int n,
 		  int indx[],
 		  char *dataPtr,
@@ -1208,11 +1208,11 @@ array_set(ArrayType * array,
  *----------------------------------------------------------------------------
  */
 char	   *
-array_assgn(ArrayType * array,
+array_assgn(ArrayType *array,
 			int n,
 			int upperIndx[],
 			int lowerIndx[],
-			ArrayType * newArr,
+			ArrayType *newArr,
 			int reftype,
 			int len,
 			bool * isNull)
@@ -1283,7 +1283,7 @@ array_assgn(ArrayType * array,
  *-----------------------------------------------------------------------------
  */
 int
-array_eq(ArrayType * array1, ArrayType * array2)
+array_eq(ArrayType *array1, ArrayType *array2)
 {
 	if ((array1 == NULL) || (array2 == NULL))
 		return (0);
@@ -1445,7 +1445,7 @@ _ArrayRange(int st[],
 			int endp[],
 			int bsize,
 			char *destPtr,
-			ArrayType * array,
+			ArrayType *array,
 			int from)
 {
 	int			n,
@@ -1487,7 +1487,7 @@ _ArrayRange(int st[],
 }
 
 static int
-_ArrayClipCount(int stI[], int endpI[], ArrayType * array)
+_ArrayClipCount(int stI[], int endpI[], ArrayType *array)
 {
 	int			n,
 			   *dim,
@@ -1568,7 +1568,7 @@ _LOArrayRange(int st[],
 			  int bsize,
 			  int srcfd,
 			  int destfd,
-			  ArrayType * array,
+			  ArrayType *array,
 			  int isSrcLO,
 			  bool * isNull)
 {
@@ -1622,7 +1622,7 @@ _ReadArray(int st[],
 		   int bsize,
 		   int srcfd,
 		   int destfd,
-		   ArrayType * array,
+		   ArrayType *array,
 		   int isDestLO,
 		   bool * isNull)
 {
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index db5a6827a9..61f999b670 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.9 1997/09/08 02:30:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.10 1997/09/08 20:57:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -138,46 +138,55 @@ chareq(int8 arg1, int8 arg2)
 {
 	return (arg1 == arg2);
 }
+
 bool
 charne(int8 arg1, int8 arg2)
 {
 	return (arg1 != arg2);
 }
+
 bool
 charlt(int8 arg1, int8 arg2)
 {
 	return ((uint8) arg1 < (uint8) arg2);
 }
+
 bool
 charle(int8 arg1, int8 arg2)
 {
 	return ((uint8) arg1 <= (uint8) arg2);
 }
+
 bool
 chargt(int8 arg1, int8 arg2)
 {
 	return ((uint8) arg1 > (uint8) arg2);
 }
+
 bool
 charge(int8 arg1, int8 arg2)
 {
 	return ((uint8) arg1 >= (uint8) arg2);
 }
+
 int8
 charpl(int8 arg1, int8 arg2)
 {
 	return (arg1 + arg2);
 }
+
 int8
 charmi(int8 arg1, int8 arg2)
 {
 	return (arg1 - arg2);
 }
+
 int8
 charmul(int8 arg1, int8 arg2)
 {
 	return (arg1 * arg2);
 }
+
 int8
 chardiv(int8 arg1, int8 arg2)
 {
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index 021b726867..353a221859 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.8 1997/09/08 02:30:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.9 1997/09/08 20:57:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -439,7 +439,7 @@ _ReadChunkArray(int st[],
 				int bsize,
 				int fp,
 				char *destfp,
-				ArrayType * array,
+				ArrayType *array,
 				int isDestLO,
 				bool * isNull)
 {
@@ -637,7 +637,7 @@ struct varlena *
 _ReadChunkArray1El(int st[],
 				   int bsize,
 				   int fp,
-				   ArrayType * array,
+				   ArrayType *array,
 				   bool * isNull)
 {
 	int			i,
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 5a88e2bf32..7543780cff 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.16 1997/09/08 02:30:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.17 1997/09/08 20:57:26 momjian Exp $
  *
  * NOTES
  *	 This code is actually (almost) unused.
@@ -104,8 +104,8 @@ static int	correct_dir(char direction[], int *signptr);
 
 static int
 istinterval(char *i_string,
-			AbsoluteTime * i_start,
-			AbsoluteTime * i_end);
+			AbsoluteTime *i_start,
+			AbsoluteTime *i_end);
 
 /*****************************************************************************
  *	 USER I/O ROUTINES														 *
@@ -952,8 +952,8 @@ correct_dir(char direction[], int *signptr)
  */
 static int
 istinterval(char *i_string,
-			AbsoluteTime * i_start,
-			AbsoluteTime * i_end)
+			AbsoluteTime *i_start,
+			AbsoluteTime *i_end)
 {
 	register char *p,
 			   *p1;
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index ac3bb85398..95287601bc 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.21 1997/09/08 02:30:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.22 1997/09/08 20:57:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,10 +31,10 @@
 static int	point_inside(Point * p, int npts, Point plist[]);
 static int	lseg_crossing(double x, double y, double px, double py);
 static BOX *box_construct(double x1, double x2, double y1, double y2);
-static BOX *box_copy(BOX * box);
-static BOX *box_fill(BOX * result, double x1, double x2, double y1, double y2);
-static double box_ht(BOX * box);
-static double box_wd(BOX * box);
+static BOX *box_copy(BOX *box);
+static BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2);
+static double box_ht(BOX *box);
+static double box_wd(BOX *box);
 static double circle_ar(CIRCLE * circle);
 static CIRCLE *circle_copy(CIRCLE * circle);
 static LINE *line_construct_pm(Point * pt, double m);
@@ -57,7 +57,7 @@ static int	pair_count(char *s, char delim);
 static int	path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point * p);
 static char *path_encode(bool closed, int npts, Point * pt);
 static void statlseg_construct(LSEG * lseg, Point * pt1, Point * pt2);
-static double box_ar(BOX * box);
+static double box_ar(BOX *box);
 static Point *interpt_sl(LSEG * lseg, LINE * line);
 static LINE *line_construct_pp(Point * pt1, Point * pt2);
 
@@ -384,7 +384,7 @@ box_in(char *str)
 /*		box_out -		convert a box to external form.
  */
 char	   *
-box_out(BOX * box)
+box_out(BOX *box)
 {
 	if (!PointerIsValid(box))
 		return (NULL);
@@ -407,7 +407,7 @@ box_construct(double x1, double x2, double y1, double y2)
 /*		box_fill		-		fill in a static box
  */
 static BOX *
-box_fill(BOX * result, double x1, double x2, double y1, double y2)
+box_fill(BOX *result, double x1, double x2, double y1, double y2)
 {
 	if (x1 > x2)
 	{
@@ -437,7 +437,7 @@ box_fill(BOX * result, double x1, double x2, double y1, double y2)
 /*		box_copy		-		copy a box
  */
 static BOX *
-box_copy(BOX * box)
+box_copy(BOX *box)
 {
 	BOX		   *result = PALLOCTYPE(BOX);
 
@@ -455,7 +455,7 @@ box_copy(BOX * box)
 /*		box_same		-		are two boxes identical?
  */
 bool
-box_same(BOX * box1, BOX * box2)
+box_same(BOX *box1, BOX *box2)
 {
 	return ((FPeq(box1->high.x, box2->high.x) && FPeq(box1->low.x, box2->low.x)) &&
 	(FPeq(box1->high.y, box2->high.y) && FPeq(box1->low.y, box2->low.y)));
@@ -464,7 +464,7 @@ box_same(BOX * box1, BOX * box2)
 /*		box_overlap		-		does box1 overlap box2?
  */
 bool
-box_overlap(BOX * box1, BOX * box2)
+box_overlap(BOX *box1, BOX *box2)
 {
 	return (((FPge(box1->high.x, box2->high.x) && FPle(box1->low.x, box2->high.x)) ||
 			 (FPge(box2->high.x, box1->high.x) && FPle(box2->low.x, box1->high.x))) &&
@@ -479,7 +479,7 @@ box_overlap(BOX * box1, BOX * box2)
  *		when time ranges are stored as rectangles.
  */
 bool
-box_overleft(BOX * box1, BOX * box2)
+box_overleft(BOX *box1, BOX *box2)
 {
 	return (FPle(box1->high.x, box2->high.x));
 }
@@ -487,7 +487,7 @@ box_overleft(BOX * box1, BOX * box2)
 /*		box_left		-		is box1 strictly left of box2?
  */
 bool
-box_left(BOX * box1, BOX * box2)
+box_left(BOX *box1, BOX *box2)
 {
 	return (FPlt(box1->high.x, box2->low.x));
 }
@@ -495,7 +495,7 @@ box_left(BOX * box1, BOX * box2)
 /*		box_right		-		is box1 strictly right of box2?
  */
 bool
-box_right(BOX * box1, BOX * box2)
+box_right(BOX *box1, BOX *box2)
 {
 	return (FPgt(box1->low.x, box2->high.x));
 }
@@ -507,7 +507,7 @@ box_right(BOX * box1, BOX * box2)
  *		are stored as rectangles.
  */
 bool
-box_overright(BOX * box1, BOX * box2)
+box_overright(BOX *box1, BOX *box2)
 {
 	return (box1->low.x >= box2->low.x);
 }
@@ -515,7 +515,7 @@ box_overright(BOX * box1, BOX * box2)
 /*		box_contained	-		is box1 contained by box2?
  */
 bool
-box_contained(BOX * box1, BOX * box2)
+box_contained(BOX *box1, BOX *box2)
 {
 	return ((FPle(box1->high.x, box2->high.x) && FPge(box1->low.x, box2->low.x)) &&
 	(FPle(box1->high.y, box2->high.y) && FPge(box1->low.y, box2->low.y)));
@@ -524,7 +524,7 @@ box_contained(BOX * box1, BOX * box2)
 /*		box_contain		-		does box1 contain box2?
  */
 bool
-box_contain(BOX * box1, BOX * box2)
+box_contain(BOX *box1, BOX *box2)
 {
 	return ((FPge(box1->high.x, box2->high.x) && FPle(box1->low.x, box2->low.x) &&
 	FPge(box1->high.y, box2->high.y) && FPle(box1->low.y, box2->low.y)));
@@ -535,13 +535,13 @@ box_contain(BOX * box1, BOX * box2)
  *				is box1 entirely {above,below} box2?
  */
 bool
-box_below(BOX * box1, BOX * box2)
+box_below(BOX *box1, BOX *box2)
 {
 	return (FPle(box1->high.y, box2->low.y));
 }
 
 bool
-box_above(BOX * box1, BOX * box2)
+box_above(BOX *box1, BOX *box2)
 {
 	return (FPge(box1->low.y, box2->high.y));
 }
@@ -551,31 +551,31 @@ box_above(BOX * box1, BOX * box2)
  *								our accuracy constraint?
  */
 bool
-box_lt(BOX * box1, BOX * box2)
+box_lt(BOX *box1, BOX *box2)
 {
 	return (FPlt(box_ar(box1), box_ar(box2)));
 }
 
 bool
-box_gt(BOX * box1, BOX * box2)
+box_gt(BOX *box1, BOX *box2)
 {
 	return (FPgt(box_ar(box1), box_ar(box2)));
 }
 
 bool
-box_eq(BOX * box1, BOX * box2)
+box_eq(BOX *box1, BOX *box2)
 {
 	return (FPeq(box_ar(box1), box_ar(box2)));
 }
 
 bool
-box_le(BOX * box1, BOX * box2)
+box_le(BOX *box1, BOX *box2)
 {
 	return (FPle(box_ar(box1), box_ar(box2)));
 }
 
 bool
-box_ge(BOX * box1, BOX * box2)
+box_ge(BOX *box1, BOX *box2)
 {
 	return (FPge(box_ar(box1), box_ar(box2)));
 }
@@ -593,7 +593,7 @@ box_ge(BOX * box1, BOX * box2)
 /*		box_area		-		returns the area of the box.
  */
 double	   *
-box_area(BOX * box)
+box_area(BOX *box)
 {
 	double	   *result = PALLOCTYPE(double);
 
@@ -607,7 +607,7 @@ box_area(BOX * box)
  *								  (horizontal magnitude).
  */
 double	   *
-box_width(BOX * box)
+box_width(BOX *box)
 {
 	double	   *result = PALLOCTYPE(double);
 
@@ -621,7 +621,7 @@ box_width(BOX * box)
  *								  (vertical magnitude).
  */
 double	   *
-box_height(BOX * box)
+box_height(BOX *box)
 {
 	double	   *result = PALLOCTYPE(double);
 
@@ -635,7 +635,7 @@ box_height(BOX * box)
  *								  center points of two boxes.
  */
 double	   *
-box_distance(BOX * box1, BOX * box2)
+box_distance(BOX *box1, BOX *box2)
 {
 	double	   *result = PALLOCTYPE(double);
 	Point	   *a,
@@ -654,7 +654,7 @@ box_distance(BOX * box1, BOX * box2)
 /*		box_center		-		returns the center point of the box.
  */
 Point	   *
-box_center(BOX * box)
+box_center(BOX *box)
 {
 	Point	   *result = PALLOCTYPE(Point);
 
@@ -668,7 +668,7 @@ box_center(BOX * box)
 /*		box_ar	-		returns the area of the box.
  */
 static double
-box_ar(BOX * box)
+box_ar(BOX *box)
 {
 	return (box_wd(box) * box_ht(box));
 }
@@ -678,7 +678,7 @@ box_ar(BOX * box)
  *								  (horizontal magnitude).
  */
 static double
-box_wd(BOX * box)
+box_wd(BOX *box)
 {
 	return (box->high.x - box->low.x);
 }
@@ -688,7 +688,7 @@ box_wd(BOX * box)
  *								  (vertical magnitude).
  */
 static double
-box_ht(BOX * box)
+box_ht(BOX *box)
 {
 	return (box->high.y - box->low.y);
 }
@@ -699,7 +699,7 @@ box_ht(BOX * box)
  */
 #ifdef NOT_USED
 static double
-box_dt(BOX * box1, BOX * box2)
+box_dt(BOX *box1, BOX *box2)
 {
 	double		result;
 	Point	   *a,
@@ -725,7 +725,7 @@ box_dt(BOX * box1, BOX * box2)
  *				  or NULL if they do not intersect.
  */
 BOX		   *
-box_intersect(BOX * box1, BOX * box2)
+box_intersect(BOX *box1, BOX *box2)
 {
 	BOX		   *result;
 
@@ -749,7 +749,7 @@ box_intersect(BOX * box1, BOX * box2)
  *				provided, of course, we have LSEGs.
  */
 LSEG	   *
-box_diagonal(BOX * box)
+box_diagonal(BOX *box)
 {
 	Point		p1,
 				p2;
@@ -1928,7 +1928,7 @@ dist_ppath(Point * pt, PATH * path)
 }
 
 double	   *
-dist_pb(Point * pt, BOX * box)
+dist_pb(Point * pt, BOX *box)
 {
 	Point	   *tmp;
 	double	   *result;
@@ -1973,7 +1973,7 @@ dist_sl(LSEG * lseg, LINE * line)
 
 
 double	   *
-dist_sb(LSEG * lseg, BOX * box)
+dist_sb(LSEG * lseg, BOX *box)
 {
 	Point	   *tmp;
 	double	   *result;
@@ -1995,7 +1995,7 @@ dist_sb(LSEG * lseg, BOX * box)
 
 
 double	   *
-dist_lb(LINE * line, BOX * box)
+dist_lb(LINE * line, BOX *box)
 {
 	Point	   *tmp;
 	double	   *result;
@@ -2227,7 +2227,7 @@ close_ps(Point * pt, LSEG * lseg)
 }								/* close_ps() */
 
 Point	   *
-close_pb(Point * pt, BOX * box)
+close_pb(Point * pt, BOX *box)
 {
 	/* think about this one for a while */
 	elog(WARN, "close_pb not implemented", NULL);
@@ -2258,7 +2258,7 @@ close_sl(LSEG * lseg, LINE * line)
 }
 
 Point	   *
-close_sb(LSEG * lseg, BOX * box)
+close_sb(LSEG * lseg, BOX *box)
 {
 	/* think about this one for a while */
 	elog(WARN, "close_sb not implemented", NULL);
@@ -2267,7 +2267,7 @@ close_sb(LSEG * lseg, BOX * box)
 }
 
 Point	   *
-close_lb(LINE * line, BOX * box)
+close_lb(LINE * line, BOX *box)
 {
 	/* think about this one for a while */
 	elog(WARN, "close_lb not implemented", NULL);
@@ -2308,7 +2308,7 @@ on_ps(Point * pt, LSEG * lseg)
 }
 
 bool
-on_pb(Point * pt, BOX * box)
+on_pb(Point * pt, BOX *box)
 {
 	if (!PointerIsValid(pt) || !PointerIsValid(box))
 		return (FALSE);
@@ -2433,7 +2433,7 @@ on_sl(LSEG * lseg, LINE * line)
 }								/* on_sl() */
 
 bool
-on_sb(LSEG * lseg, BOX * box)
+on_sb(LSEG * lseg, BOX *box)
 {
 	if (!PointerIsValid(lseg) || !PointerIsValid(box))
 		return (FALSE);
@@ -2466,7 +2466,7 @@ inter_sl(LSEG * lseg, LINE * line)
 /* XXX segment and box should be able to intersect; tgl - 97/01/09 */
 
 bool
-inter_sb(LSEG * lseg, BOX * box)
+inter_sb(LSEG * lseg, BOX *box)
 {
 	return (0);
 }
@@ -2474,7 +2474,7 @@ inter_sb(LSEG * lseg, BOX * box)
 /* XXX line and box should be able to intersect; tgl - 97/01/09 */
 
 bool
-inter_lb(LINE * line, BOX * box)
+inter_lb(LINE * line, BOX *box)
 {
 	return (0);
 }
@@ -2887,7 +2887,7 @@ box(Point * p1, Point * p2)
 }								/* box() */
 
 BOX		   *
-box_add(BOX * box, Point * p)
+box_add(BOX *box, Point * p)
 {
 	BOX		   *result;
 
@@ -2901,7 +2901,7 @@ box_add(BOX * box, Point * p)
 }								/* box_add() */
 
 BOX		   *
-box_sub(BOX * box, Point * p)
+box_sub(BOX *box, Point * p)
 {
 	BOX		   *result;
 
@@ -2915,7 +2915,7 @@ box_sub(BOX * box, Point * p)
 }								/* box_sub() */
 
 BOX		   *
-box_mul(BOX * box, Point * p)
+box_mul(BOX *box, Point * p)
 {
 	BOX		   *result;
 	Point	   *high,
@@ -2935,7 +2935,7 @@ box_mul(BOX * box, Point * p)
 }								/* box_mul() */
 
 BOX		   *
-box_div(BOX * box, Point * p)
+box_div(BOX *box, Point * p)
 {
 	BOX		   *result;
 	Point	   *high,
@@ -3273,7 +3273,7 @@ poly_box(POLYGON * poly)
  * Convert a box to a polygon.
  */
 POLYGON    *
-box_poly(BOX * box)
+box_poly(BOX *box)
 {
 	POLYGON    *poly;
 	int			size;
@@ -3958,7 +3958,7 @@ circle_box(CIRCLE * circle)
  * Convert a box to a circle.
  */
 CIRCLE	   *
-box_circle(BOX * box)
+box_circle(BOX *box)
 {
 	CIRCLE	   *circle;
 
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index b194519617..1eaededbf2 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.6 1997/09/08 02:30:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.7 1997/09/08 20:57:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -248,26 +248,31 @@ int4eq(int32 arg1, int32 arg2)
 {
 	return (arg1 == arg2);
 }
+
 bool
 int4ne(int32 arg1, int32 arg2)
 {
 	return (arg1 != arg2);
 }
+
 bool
 int4lt(int32 arg1, int32 arg2)
 {
 	return (arg1 < arg2);
 }
+
 bool
 int4le(int32 arg1, int32 arg2)
 {
 	return (arg1 <= arg2);
 }
+
 bool
 int4gt(int32 arg1, int32 arg2)
 {
 	return (arg1 > arg2);
 }
+
 bool
 int4ge(int32 arg1, int32 arg2)
 {
@@ -279,26 +284,31 @@ int2eq(int16 arg1, int16 arg2)
 {
 	return (arg1 == arg2);
 }
+
 bool
 int2ne(int16 arg1, int16 arg2)
 {
 	return (arg1 != arg2);
 }
+
 bool
 int2lt(int16 arg1, int16 arg2)
 {
 	return (arg1 < arg2);
 }
+
 bool
 int2le(int16 arg1, int16 arg2)
 {
 	return (arg1 <= arg2);
 }
+
 bool
 int2gt(int16 arg1, int16 arg2)
 {
 	return (arg1 > arg2);
 }
+
 bool
 int2ge(int16 arg1, int16 arg2)
 {
@@ -310,26 +320,31 @@ int24eq(int32 arg1, int32 arg2)
 {
 	return (arg1 == arg2);
 }
+
 bool
 int24ne(int32 arg1, int32 arg2)
 {
 	return (arg1 != arg2);
 }
+
 bool
 int24lt(int32 arg1, int32 arg2)
 {
 	return (arg1 < arg2);
 }
+
 bool
 int24le(int32 arg1, int32 arg2)
 {
 	return (arg1 <= arg2);
 }
+
 bool
 int24gt(int32 arg1, int32 arg2)
 {
 	return (arg1 > arg2);
 }
+
 bool
 int24ge(int32 arg1, int32 arg2)
 {
@@ -341,26 +356,31 @@ int42eq(int32 arg1, int32 arg2)
 {
 	return (arg1 == arg2);
 }
+
 bool
 int42ne(int32 arg1, int32 arg2)
 {
 	return (arg1 != arg2);
 }
+
 bool
 int42lt(int32 arg1, int32 arg2)
 {
 	return (arg1 < arg2);
 }
+
 bool
 int42le(int32 arg1, int32 arg2)
 {
 	return (arg1 <= arg2);
 }
+
 bool
 int42gt(int32 arg1, int32 arg2)
 {
 	return (arg1 > arg2);
 }
+
 bool
 int42ge(int32 arg1, int32 arg2)
 {
@@ -385,26 +405,31 @@ int4um(int32 arg)
 {
 	return (-arg);
 }
+
 int32
 int4pl(int32 arg1, int32 arg2)
 {
 	return (arg1 + arg2);
 }
+
 int32
 int4mi(int32 arg1, int32 arg2)
 {
 	return (arg1 - arg2);
 }
+
 int32
 int4mul(int32 arg1, int32 arg2)
 {
 	return (arg1 * arg2);
 }
+
 int32
 int4div(int32 arg1, int32 arg2)
 {
 	return (arg1 / arg2);
 }
+
 int32
 int4inc(int32 arg)
 {
@@ -416,26 +441,31 @@ int2um(int16 arg)
 {
 	return (-arg);
 }
+
 int16
 int2pl(int16 arg1, int16 arg2)
 {
 	return (arg1 + arg2);
 }
+
 int16
 int2mi(int16 arg1, int16 arg2)
 {
 	return (arg1 - arg2);
 }
+
 int16
 int2mul(int16 arg1, int16 arg2)
 {
 	return (arg1 * arg2);
 }
+
 int16
 int2div(int16 arg1, int16 arg2)
 {
 	return (arg1 / arg2);
 }
+
 int16
 int2inc(int16 arg)
 {
@@ -447,16 +477,19 @@ int24pl(int32 arg1, int32 arg2)
 {
 	return (arg1 + arg2);
 }
+
 int32
 int24mi(int32 arg1, int32 arg2)
 {
 	return (arg1 - arg2);
 }
+
 int32
 int24mul(int32 arg1, int32 arg2)
 {
 	return (arg1 * arg2);
 }
+
 int32
 int24div(int32 arg1, int32 arg2)
 {
@@ -468,16 +501,19 @@ int42pl(int32 arg1, int32 arg2)
 {
 	return (arg1 + arg2);
 }
+
 int32
 int42mi(int32 arg1, int32 arg2)
 {
 	return (arg1 - arg2);
 }
+
 int32
 int42mul(int32 arg1, int32 arg2)
 {
 	return (arg1 * arg2);
 }
+
 int32
 int42div(int32 arg1, int32 arg2)
 {
@@ -492,16 +528,19 @@ int4mod(int32 arg1, int32 arg2)
 {
 	return (arg1 % arg2);
 }
+
 int32
 int2mod(int16 arg1, int16 arg2)
 {
 	return (arg1 % arg2);
 }
+
 int32
 int24mod(int32 arg1, int32 arg2)
 {
 	return (arg1 % arg2);
 }
+
 int32
 int42mod(int32 arg1, int32 arg2)
 {
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index cc343f4d3e..bd76c639d2 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.6 1997/09/08 02:31:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.7 1997/09/08 20:57:39 momjian Exp $
  *
  * Note - this code is real crufty...
  *
@@ -60,7 +60,7 @@ typedef union AnyInvalidation
 {
 	CatalogInvalidationData catalog;
 	RelationInvalidationData relation;
-}			AnyInvalidation;
+} AnyInvalidation;
 
 typedef struct InvalidationMessageData
 {
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index f78d8b5f32..db98bdc83d 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.7 1997/09/08 02:32:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.8 1997/09/08 20:57:46 momjian Exp $
  *
  * NOTE
  *	  XXX This is a preliminary implementation which lacks fail-fast
@@ -46,7 +46,7 @@ typedef struct AllocElemData
 {
 	OrderedElemData elemData;	/* elem in AllocSet */
 	Size		size;
-}			AllocElemData;
+} AllocElemData;
 
 typedef AllocElemData *AllocElem;
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 7409b62873..82b0f71bea 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.42 1997/09/08 02:32:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.43 1997/09/08 20:57:50 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -1027,7 +1027,7 @@ clearIndInfo(IndInfo * ind, int numIndices)
 }
 
 void
-clearAggInfo(AggInfo * agginfo, int numArgs)
+clearAggInfo(AggInfo *agginfo, int numArgs)
 {
 	int			i;
 
@@ -1837,7 +1837,7 @@ dumpOprs(FILE * fout, OprInfo * oprinfo, int numOperators,
  *
  */
 void
-dumpAggs(FILE * fout, AggInfo * agginfo, int numAggs,
+dumpAggs(FILE * fout, AggInfo *agginfo, int numAggs,
 		 TypeInfo * tinfo, int numTypes)
 {
 	int			i;
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index cf50bee06e..ba5da2dc6d 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_dump.h,v 1.21 1997/09/08 02:32:50 momjian Exp $
+ * $Id: pg_dump.h,v 1.22 1997/09/08 20:57:56 momjian Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -124,7 +124,7 @@ typedef struct _aggInfo
 	char	   *agginitval1;
 	char	   *agginitval2;
 	char	   *usename;
-}			AggInfo;
+} AggInfo;
 
 typedef struct _oprInfo
 {
@@ -216,7 +216,7 @@ extern void
 dumpFuncs(FILE * fout, FuncInfo * finfo, int numFuncs,
 		  TypeInfo * tinfo, int numTypes);
 extern void
-dumpAggs(FILE * fout, AggInfo * agginfo, int numAggregates,
+dumpAggs(FILE * fout, AggInfo *agginfo, int numAggregates,
 		 TypeInfo * tinfo, int numTypes);
 extern void
 dumpOprs(FILE * fout, OprInfo * agginfo, int numOperators,
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index c80d206cb0..5c04951aa4 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -189,7 +189,7 @@ typedef struct intrange
 extern void
 gistbuild(Relation heap,
 		  Relation index, int natts,
-		  AttrNumber * attnum, IndexStrategy istrat,
+		  AttrNumber *attnum, IndexStrategy istrat,
 		  uint16 pint, Datum * params,
 		  FuncIndexInfo * finfo,
 		  PredInfo * predInfo);
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index f9b93e0de7..7d45a7e5b9 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.9 1997/09/08 02:34:08 momjian Exp $
+ * $Id: hash.h,v 1.10 1997/09/08 20:58:02 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -250,7 +250,7 @@ typedef HashItemData *HashItem;
 
 extern void
 hashbuild(Relation heap, Relation index, int natts,
-		  AttrNumber * attnum, IndexStrategy istrat, uint16 pcount,
+		  AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
 		  Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
 extern		InsertIndexResult
 hashinsert(Relation rel, Datum * datum, char *nulls,
@@ -286,7 +286,7 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem);
 
 
 /* hashovfl.c */
-extern Buffer _hash_addovflpage(Relation rel, Buffer * metabufp, Buffer buf);
+extern Buffer _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf);
 extern Buffer _hash_freeovflpage(Relation rel, Buffer ovflbuf);
 extern		int32
 _hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum,
@@ -303,7 +303,7 @@ extern void _hash_relbuf(Relation rel, Buffer buf, int access);
 extern void _hash_wrtbuf(Relation rel, Buffer buf);
 extern void _hash_wrtnorelbuf(Relation rel, Buffer buf);
 extern		Page
-_hash_chgbufaccess(Relation rel, Buffer * bufp, int from_access,
+_hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access,
 				   int to_access);
 extern void _hash_pageinit(Page page, Size size);
 extern void _hash_pagedel(Relation rel, ItemPointer tid);
@@ -319,11 +319,11 @@ extern void _hash_adjscans(Relation rel, ItemPointer tid);
 /* hashsearch.c */
 extern void
 _hash_search(Relation rel, int keysz, ScanKey scankey,
-			 Buffer * bufP, HashMetaPage metap);
+			 Buffer *bufP, HashMetaPage metap);
 extern RetrieveIndexResult _hash_next(IndexScanDesc scan, ScanDirection dir);
 extern RetrieveIndexResult _hash_first(IndexScanDesc scan, ScanDirection dir);
 extern		bool
-_hash_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir,
+_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir,
 		   Buffer metabuf);
 
 
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index c82b23e742..d3e2ae5bbe 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.13 1997/09/08 02:34:10 momjian Exp $
+ * $Id: heapam.h,v 1.14 1997/09/08 20:58:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -122,10 +122,10 @@ heap_beginscan(Relation relation, int atend,
 			   TimeQual timeQual, unsigned nkeys, ScanKey key);
 extern void heap_rescan(HeapScanDesc sdesc, bool scanFromEnd, ScanKey key);
 extern void heap_endscan(HeapScanDesc sdesc);
-extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer * b);
+extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b);
 extern		HeapTuple
 heap_fetch(Relation relation, TimeQual timeQual,
-		   ItemPointer tid, Buffer * b);
+		   ItemPointer tid, Buffer *b);
 extern Oid	heap_insert(Relation relation, HeapTuple tup);
 extern int	heap_delete(Relation relation, ItemPointer tid);
 extern int
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 813e557d55..e902bbf228 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.16 1997/09/08 02:34:17 momjian Exp $
+ * $Id: nbtree.h,v 1.17 1997/09/08 20:58:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,7 +50,7 @@ typedef struct BTPageOpaqueData
 #define BTP_META		(1 << 3)
 #define BTP_CHAIN		(1 << 4)
 
-}			BTPageOpaqueData;
+} BTPageOpaqueData;
 
 typedef BTPageOpaqueData *BTPageOpaque;
 
@@ -74,7 +74,7 @@ typedef struct BTScanOpaqueData
 	uint16		numberOfFirstKeys;		/* number of keys for 1st
 										 * attribute */
 	ScanKey		keyData;		/* key descriptor */
-}			BTScanOpaqueData;
+} BTScanOpaqueData;
 
 typedef BTScanOpaqueData *BTScanOpaque;
 
@@ -104,7 +104,7 @@ typedef struct BTItemData
 								 * 8-byte boundary */
 #endif
 	IndexTupleData bti_itup;
-}			BTItemData;
+} BTItemData;
 
 typedef BTItemData *BTItem;
 
@@ -135,7 +135,7 @@ typedef struct BTStackData
 	OffsetNumber bts_offset;
 	BTItem		bts_btitem;
 	struct BTStackData *bts_parent;
-}			BTStackData;
+} BTStackData;
 
 typedef BTStackData *BTStack;
 
@@ -149,7 +149,7 @@ typedef struct BTPageState
 	int			btps_level;
 	bool		btps_doupper;
 	struct BTPageState *btps_next;
-}			BTPageState;
+} BTPageState;
 
 /*
  *	We need to be able to tell the difference between read and write
@@ -243,7 +243,7 @@ extern bool BuildingBtree;		/* in nbtree.c */
 
 extern void
 btbuild(Relation heap, Relation index, int natts,
-		AttrNumber * attnum, IndexStrategy istrat, uint16 pcount,
+		AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
 		Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
 extern		InsertIndexResult
 btinsert(Relation rel, Datum * datum, char *nulls,
@@ -270,10 +270,10 @@ extern void _bt_adjscans(Relation rel, ItemPointer tid, int op);
 /*
  * prototypes for functions in nbtsearch.c
  */
-extern		BTStack
+extern BTStack
 _bt_search(Relation rel, int keysz, ScanKey scankey,
-		   Buffer * bufP);
-extern		Buffer
+		   Buffer *bufP);
+extern Buffer
 _bt_moveright(Relation rel, Buffer buf, int keysz,
 			  ScanKey scankey, int access);
 extern		bool
@@ -284,7 +284,7 @@ _bt_binsrch(Relation rel, Buffer buf, int keysz,
 			ScanKey scankey, int srchtype);
 extern RetrieveIndexResult _bt_next(IndexScanDesc scan, ScanDirection dir);
 extern RetrieveIndexResult _bt_first(IndexScanDesc scan, ScanDirection dir);
-extern bool _bt_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir);
+extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
 
 /*
  * prototypes for functions in nbtstrat.c
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index e8c05bdd29..57ceffd03c 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.8 1997/09/08 02:34:23 momjian Exp $
+ * $Id: rtree.h,v 1.9 1997/09/08 20:58:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -130,7 +130,7 @@ extern void rtrestrpos(IndexScanDesc s);
 extern void rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
 extern void
 rtbuild(Relation heap, Relation index, int natts,
-		AttrNumber * attnum, IndexStrategy istrat, uint16 pcount,
+		AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
 		Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
 extern void _rtdump(Relation r);
 
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index 222a45f8f7..be8436790a 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: strat.h,v 1.6 1997/09/08 02:34:27 momjian Exp $
+ * $Id: strat.h,v 1.7 1997/09/08 20:58:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,6 +25,7 @@ typedef struct StrategyTransformMapData
 	StrategyNumber strategy[1]; /* VARIABLE LENGTH ARRAY */
 }			StrategyTransformMapData;	/* VARIABLE LENGTH
 
+										 *
 										 *
 										 * STRUCTURE */
 
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 7a898c4eb5..db95804e16 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: transam.h,v 1.9 1997/09/08 02:34:27 momjian Exp $
+ * $Id: transam.h,v 1.10 1997/09/08 20:58:12 momjian Exp $
  *
  *	 NOTES
  *		Transaction System Version 101 now support proper oid
@@ -154,7 +154,7 @@ extern void TransactionIdAbort(TransactionId transactionId);
 extern void AmiTransactionOverride(bool flag);
 extern void
 TransComputeBlockNumber(Relation relation,
-			 TransactionId transactionId, BlockNumber * blockNumberOutP);
+			  TransactionId transactionId, BlockNumber *blockNumberOutP);
 extern		XidStatus
 TransBlockNumberGetXidStatus(Relation relation,
 			   BlockNumber blockNumber, TransactionId xid, bool * failP);
@@ -162,7 +162,7 @@ extern void
 TransBlockNumberSetXidStatus(Relation relation,
 		   BlockNumber blockNumber, TransactionId xid, XidStatus xstatus,
 							 bool * failP);
-extern		AbsoluteTime
+extern AbsoluteTime
 TransBlockNumberGetCommitTime(Relation relation,
 			   BlockNumber blockNumber, TransactionId xid, bool * failP);
 extern void
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index 870098b2c0..fe7939119c 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupdesc.h,v 1.10 1997/09/08 02:34:31 momjian Exp $
+ * $Id: tupdesc.h,v 1.11 1997/09/08 20:58:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,7 @@ typedef struct attrDefault
 	AttrNumber	adnum;
 	char	   *adbin;
 	char	   *adsrc;
-}			AttrDefault;
+} AttrDefault;
 
 typedef struct constrCheck
 {
@@ -57,7 +57,7 @@ typedef struct tupleDesc
 
 extern TupleDesc CreateTemplateTupleDesc(int natts);
 
-extern TupleDesc CreateTupleDesc(int natts, AttributeTupleForm * attrs);
+extern TupleDesc CreateTupleDesc(int natts, AttributeTupleForm *attrs);
 
 extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc);
 
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index ccf54e892a..463709ed22 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bootstrap.h,v 1.7 1997/09/08 02:34:36 momjian Exp $
+ * $Id: bootstrap.h,v 1.8 1997/09/08 20:58:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,7 @@ extern void
 index_register(char *heap,
 			   char *ind,
 			   int natts,
-			   AttrNumber * attnos,
+			   AttrNumber *attnos,
 			   uint16 nparams,
 			   Datum * params,
 			   FuncIndexInfo * finfo,
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index 01110ba9fc..35c7e7fb5c 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAgg.h,v 1.3 1997/09/08 02:36:21 momjian Exp $
+ * $Id: nodeAgg.h,v 1.4 1997/09/08 20:58:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEAGG_H
 #define NODEAGG_H
 
-extern TupleTableSlot *ExecAgg(Agg * node);
-extern bool ExecInitAgg(Agg * node, EState * estate, Plan * parent);
-extern int	ExecCountSlotsAgg(Agg * node);
-extern void ExecEndAgg(Agg * node);
+extern TupleTableSlot *ExecAgg(Agg *node);
+extern bool ExecInitAgg(Agg *node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsAgg(Agg *node);
+extern void ExecEndAgg(Agg *node);
 
 #endif							/* NODEAGG_H */
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 0ad131a7c4..e546503910 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAppend.h,v 1.4 1997/09/08 02:36:22 momjian Exp $
+ * $Id: nodeAppend.h,v 1.5 1997/09/08 20:58:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEAPPEND_H
 #define NODEAPPEND_H
 
-extern bool ExecInitAppend(Append * node, EState * estate, Plan * parent);
-extern int	ExecCountSlotsAppend(Append * node);
-extern TupleTableSlot *ExecProcAppend(Append * node);
-extern void ExecEndAppend(Append * node);
+extern bool ExecInitAppend(Append *node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsAppend(Append *node);
+extern TupleTableSlot *ExecProcAppend(Append *node);
+extern void ExecEndAppend(Append *node);
 
 #endif							/* NODEAPPEND_H */
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 83c76aa269..f565900a5d 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.12 1997/09/08 02:37:08 momjian Exp $
+ * $Id: pqcomm.h,v 1.13 1997/09/08 20:58:26 momjian Exp $
  *
  * NOTES
  *	  Some of this should move to libpq.h
@@ -111,7 +111,7 @@ typedef struct Port
 
 	/*
 	 * PacketBufId				id;
-	 *//* id of packet buf currently in use */
+*//* id of packet buf currently in use */
 	PacketBuf	buf;			/* stream implementation (curr pack buf) */
 }			Port;
 
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index f8ad7675a5..a2cafdc642 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.10 1997/09/08 02:37:12 momjian Exp $
+ * $Id: execnodes.h,v 1.11 1997/09/08 20:58:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -328,7 +328,7 @@ typedef struct AppendState
 	List	   *as_rtentries;
 	List	   *as_result_relation_info_list;
 	List	   *as_junkFilter_list;
-}			AppendState;
+} AppendState;
 
 /* ----------------------------------------------------------------
  *				 Scan State Information
@@ -574,7 +574,7 @@ typedef struct AggState
 {
 	CommonScanState csstate;	/* its first field is NodeTag */
 	bool		agg_done;
-}			AggState;
+} AggState;
 
 /* ---------------------
  *	GroupState information
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index aa31112915..97890a37a8 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.25 1997/09/08 02:37:23 momjian Exp $
+ * $Id: parsenodes.h,v 1.26 1997/09/08 20:58:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -86,7 +86,7 @@ typedef struct AddAttrStmt
 	char	   *relname;		/* the relation to add attr */
 	bool		inh;			/* add recursively to children? */
 	struct ColumnDef *colDef;	/* the attribute definition */
-}			AddAttrStmt;
+} AddAttrStmt;
 
 /* ----------------------
  *		Change ACL Statement
@@ -132,7 +132,7 @@ typedef struct CopyStmt
 typedef enum ArchType
 {
 	ARCH_NONE, ARCH_LIGHT, ARCH_HEAVY	/* archive mode */
-}			ArchType;
+} ArchType;
 
 typedef struct CreateStmt
 {
@@ -562,7 +562,7 @@ typedef struct AppendStmt
 	List	   *targetList;		/* the target list (of ResTarget) */
 	List	   *fromClause;		/* the from clause */
 	Node	   *whereClause;	/* qualifications */
-}			AppendStmt;
+} AppendStmt;
 
 /* ----------------------
  *		Delete Statement
@@ -676,7 +676,7 @@ typedef struct A_Expr
 	char	   *opname;			/* name of operator/function */
 	Node	   *lexpr;			/* left argument */
 	Node	   *rexpr;			/* right argument */
-}			A_Expr;
+} A_Expr;
 
 /*
  * Attr -
@@ -692,7 +692,7 @@ typedef struct Attr
 	List	   *attrs;			/* attributes (possibly nested); list of
 								 * Values (strings) */
 	List	   *indirection;	/* array refs (list of A_Indices') */
-}			Attr;
+} Attr;
 
 /*
  * A_Const - a constant expression
@@ -702,7 +702,7 @@ typedef struct A_Const
 	NodeTag		type;
 	Value		val;			/* the value (with the tag) */
 	TypeName   *typename;		/* typecast */
-}			A_Const;
+} A_Const;
 
 /*
  * ColumnDef - column definition (used in various creates)
@@ -750,7 +750,7 @@ typedef struct A_Indices
 	NodeTag		type;
 	Node	   *lidx;			/* could be NULL */
 	Node	   *uidx;
-}			A_Indices;
+} A_Indices;
 
 /*
  * ResTarget -
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 6942d206fb..c20b9b6376 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plannodes.h,v 1.8 1997/09/08 02:37:26 momjian Exp $
+ * $Id: plannodes.h,v 1.9 1997/09/08 20:58:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -129,7 +129,7 @@ typedef struct Append
 	Index		unionrelid;
 	List	   *unionrtentries;
 	AppendState *unionstate;
-}			Append;
+} Append;
 
 /*
  * ==========
@@ -223,7 +223,7 @@ typedef struct Agg
 	int			numAgg;
 	Aggreg	  **aggs;
 	AggState   *aggstate;
-}			Agg;
+} Agg;
 
 /* ---------------
  *	 group node -
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index e28c312885..733a7c06ff 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: primnodes.h,v 1.9 1997/09/08 02:37:27 momjian Exp $
+ * $Id: primnodes.h,v 1.10 1997/09/08 20:58:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -267,7 +267,7 @@ typedef struct Aggreg
 	Oid			aggtype;		/* type of final result */
 	Node	   *target;			/* attribute to aggreg on */
 	int			aggno;			/* index to ecxt_values */
-}			Aggreg;
+} Aggreg;
 
 /* ----------------
  * Array
@@ -294,7 +294,7 @@ typedef struct Array
 	IntArray	arraylow;
 	IntArray	arrayhigh;
 	int			arraylen;
-}			Array;
+} Array;
 
 /* ----------------
  *	ArrayRef:
@@ -319,6 +319,6 @@ typedef struct ArrayRef
 	List	   *reflowerindexpr;
 	Node	   *refexpr;
 	Node	   *refassgnexpr;
-}			ArrayRef;
+} ArrayRef;
 
 #endif							/* PRIMNODES_H */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 358b772b3f..d3a4ef63d6 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauses.h,v 1.5 1997/09/08 02:37:34 momjian Exp $
+ * $Id: clauses.h,v 1.6 1997/09/08 20:58:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,10 +44,10 @@ extern void fix_opid(Node * clause);
 extern List *fix_opids(List * clauses);
 extern void
 get_relattval(Node * clause, int *relid,
-			  AttrNumber * attno, Datum * constval, int *flag);
+			  AttrNumber *attno, Datum * constval, int *flag);
 extern void
 get_rels_atts(Node * clause, int *relid1,
-			  AttrNumber * attno1, int *relid2, AttrNumber * attno2);
+			  AttrNumber *attno1, int *relid2, AttrNumber *attno2);
 extern void CommuteClause(Node * clause);
 
 #endif							/* CLAUSES_H */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 2d9c41391a..af16535812 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.3 1997/09/08 02:37:55 momjian Exp $
+ * $Id: planmain.h,v 1.4 1997/09/08 20:58:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,10 +32,10 @@ make_seqscan(List * qptlist, List * qpqual, Index scanrelid,
 extern Sort *
 make_sort(List * tlist, Oid tempid, Plan * lefttree,
 		  int keycount);
-extern Agg *make_agg(List * tlist, int nagg, Aggreg ** aggs);
+extern Agg *make_agg(List * tlist, int nagg, Aggreg **aggs);
 extern Group *
 make_group(List * tlist, bool tuplePerGroup, int ngrp,
-		   AttrNumber * grpColIdx, Sort * lefttree);
+		   AttrNumber *grpColIdx, Sort * lefttree);
 extern Unique *make_unique(List * tlist, Plan * lefttree, char *uniqueAttr);
 extern List *generate_fjoin(List * tlist);
 
@@ -59,8 +59,8 @@ extern List *
 index_outerjoin_references(List * inner_indxqual,
 						   List * outer_tlist, Index inner_relid);
 extern void set_result_tlist_references(Result * resultNode);
-extern void set_agg_tlist_references(Agg * aggNode);
-extern void set_agg_agglist_references(Agg * aggNode);
+extern void set_agg_tlist_references(Agg *aggNode);
+extern void set_agg_agglist_references(Agg *aggNode);
 
 
 #endif							/* PLANMAIN_H */
diff --git a/src/include/storage/block.h b/src/include/storage/block.h
index a057122438..02b181174f 100644
--- a/src/include/storage/block.h
+++ b/src/include/storage/block.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: block.h,v 1.4 1997/09/08 02:38:55 momjian Exp $
+ * $Id: block.h,v 1.5 1997/09/08 20:58:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ typedef struct BlockIdData
 {
 	uint16		bi_hi;
 	uint16		bi_lo;
-}			BlockIdData;
+} BlockIdData;
 
 typedef BlockIdData *BlockId;	/* block identifier */
 
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 482b15d9d1..be40014b0b 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buf_internals.h,v 1.16 1997/09/08 02:38:57 momjian Exp $
+ * $Id: buf_internals.h,v 1.17 1997/09/08 20:59:00 momjian Exp $
  *
  * NOTE
  *		If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -203,18 +203,18 @@ typedef struct _bmtrace
 /* Internal routines: only called by buf.c */
 
 /*freelist.c*/
-extern void AddBufferToFreelist(BufferDesc * bf);
-extern void PinBuffer(BufferDesc * buf);
-extern void PinBuffer_Debug(char *file, int line, BufferDesc * buf);
-extern void UnpinBuffer(BufferDesc * buf);
+extern void AddBufferToFreelist(BufferDesc *bf);
+extern void PinBuffer(BufferDesc *buf);
+extern void PinBuffer_Debug(char *file, int line, BufferDesc *buf);
+extern void UnpinBuffer(BufferDesc *buf);
 extern BufferDesc *GetFreeBuffer(void);
 extern void InitFreeList(bool init);
 
 /* buf_table.c */
 extern void InitBufTable(void);
 extern BufferDesc *BufTableLookup(BufferTag * tagPtr);
-extern bool BufTableDelete(BufferDesc * buf);
-extern bool BufTableInsert(BufferDesc * buf);
+extern bool BufTableDelete(BufferDesc *buf);
+extern bool BufTableInsert(BufferDesc *buf);
 
 /* bufmgr.c */
 extern BufferDesc *BufferDescriptors;
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 9f65b80f67..469eca4de2 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.13 1997/09/08 02:38:58 momjian Exp $
+ * $Id: bufmgr.h,v 1.14 1997/09/08 20:59:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -71,13 +71,13 @@ extern int	ShowPinTrace;
 /*
  * prototypes for functions in bufmgr.c
  */
-extern		Buffer
+extern Buffer
 RelationGetBufferWithBuffer(Relation relation,
 							BlockNumber blockNumber, Buffer buffer);
 extern Buffer ReadBuffer(Relation reln, BlockNumber blockNum);
 extern int	WriteBuffer(Buffer buffer);
 extern int	WriteNoReleaseBuffer(Buffer buffer);
-extern		Buffer
+extern Buffer
 ReleaseAndReadBuffer(Buffer buffer, Relation relation,
 					 BlockNumber blockNum);
 
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 997c8c1c5e..a11783f91d 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: shmem.h,v 1.7 1997/09/08 02:39:08 momjian Exp $
+ * $Id: shmem.h,v 1.8 1997/09/08 20:59:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -91,7 +91,7 @@ typedef struct
 	char		key[BTABLE_KEYSIZE];	/* string name */
 	unsigned long location;		/* location in shared mem */
 	unsigned long size;			/* numbytes allocated for the structure */
-}			BindingEnt;
+} BindingEnt;
 
 /*
  * prototypes for functions in shmqueue.c
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 62e472f8e1..fcf6ca32ec 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.9 1997/09/08 02:39:24 momjian Exp $
+ * $Id: acl.h,v 1.10 1997/09/08 20:59:15 momjian Exp $
  *
  * NOTES
  *	  For backward-compatability purposes we have to allow there
@@ -74,7 +74,7 @@ typedef struct AclItem
 	AclId		ai_id;
 	AclIdType	ai_idtype;
 	AclMode		ai_mode;
-}			AclItem;
+} AclItem;
 
 /* Note: if the size of AclItem changes,
    change the aclitem typlen in pg_type.h */
@@ -137,7 +137,7 @@ extern char *aclcheck_error_strings[];
  */
 extern Acl *aclownerdefault(AclId ownerid);
 extern Acl *acldefault(void);
-extern Acl *aclinsert3(Acl * old_acl, AclItem * mod_aip, unsigned modechg);
+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);
@@ -150,15 +150,15 @@ makeAclStmt(char *privs, List * rel_list, char *grantee,
  */
 extern Acl *makeacl(int n);
 extern AclItem *aclitemin(char *s);
-extern char *aclitemout(AclItem * aip);
-extern Acl *aclinsert(Acl * old_acl, AclItem * mod_aip);
-extern Acl *aclremove(Acl * old_acl, AclItem * mod_aip);
-extern int32 aclcontains(Acl * acl, AclItem * aip);
+extern char *aclitemout(AclItem *aip);
+extern Acl *aclinsert(Acl *old_acl, AclItem *mod_aip);
+extern Acl *aclremove(Acl *old_acl, AclItem *mod_aip);
+extern int32 aclcontains(Acl *acl, AclItem *aip);
 
 /*
  * prototypes for functions in aclchk.c
  */
-extern void ChangeAcl(char *relname, AclItem * mod_aip, unsigned modechg);
+extern void ChangeAcl(char *relname, AclItem *mod_aip, unsigned modechg);
 extern AclId get_grosysid(char *groname);
 extern char *get_groname(AclId grosysid);
 
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index 8e8b216fd6..b8116065d4 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.6 1997/09/08 02:39:26 momjian Exp $
+ * $Id: array.h,v 1.7 1997/09/08 20:59:18 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -29,7 +29,7 @@ typedef struct
 	int			size;			/* total array size (in bytes) */
 	int			ndim;			/* # of dimensions */
 	int			flags;			/* implementation flags */
-}			ArrayType;
+} ArrayType;
 
 /*
  * bitmask of ArrayType flags field:
@@ -115,22 +115,22 @@ typedef struct
  * 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 char *array_out(ArrayType *v, Oid element_type);
+extern char *array_dims(ArrayType *v, bool * isNull);
 extern		Datum
-array_ref(ArrayType * array, int n, int indx[], int reftype,
+array_ref(ArrayType *array, int n, int indx[], int reftype,
 		  int elmlen, int arraylen, bool * isNull);
 extern		Datum
-array_clip(ArrayType * array, int n, int upperIndx[],
+array_clip(ArrayType *array, int n, int upperIndx[],
 		   int lowerIndx[], int reftype, int len, bool * isNull);
 extern char *
-array_set(ArrayType * array, int n, int indx[], char *dataPtr,
+array_set(ArrayType *array, int n, int indx[], char *dataPtr,
 		  int reftype, int elmlen, int arraylen, bool * isNull);
 extern char *
-array_assgn(ArrayType * array, int n, int upperIndx[],
-			int lowerIndx[], ArrayType * newArr, int reftype,
+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 int	array_eq(ArrayType *array1, ArrayType *array2);
 extern int
 _LOtransfer(char **destfd, int size, int nitems, char **srcfd,
 			int isSrcLO, int isDestLO);
@@ -161,10 +161,10 @@ _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 cba39b62ac..f7fc9d2190 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.23 1997/09/08 02:39:32 momjian Exp $
+ * $Id: builtins.h,v 1.24 1997/09/08 20:59:19 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -199,10 +199,10 @@ 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 */
-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 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);
@@ -338,7 +338,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);
+extern double *box_area(BOX *box);
 
 /* misc.c */
 extern bool nullvalue(Datum value, bool * isNull);
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index 55b5774218..be308f28ae 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.10 1997/09/08 02:39:46 momjian Exp $
+ * $Id: geo_decls.h,v 1.11 1997/09/08 20:59:21 momjian Exp $
  *
  * NOTE
  *	  These routines do *not* use the float types from adt/.
@@ -120,7 +120,7 @@ typedef struct
 {
 	Point		high,
 				low;			/* corner POINTs */
-}			BOX;
+} BOX;
 
 /*---------------------------------------------------------------------
  * POLYGON - Specified by an array of doubles defining the points,
@@ -187,65 +187,65 @@ 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_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 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_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 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_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 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 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);
 
 /* public box routines */
 extern BOX *box_in(char *str);
-extern char *box_out(BOX * box);
-extern bool box_same(BOX * box1, BOX * box2);
-extern bool box_overlap(BOX * box1, BOX * box2);
-extern bool box_overleft(BOX * box1, BOX * box2);
-extern bool box_left(BOX * box1, BOX * box2);
-extern bool box_right(BOX * box1, BOX * box2);
-extern bool box_overright(BOX * box1, BOX * box2);
-extern bool box_contained(BOX * box1, BOX * box2);
-extern bool box_contain(BOX * box1, BOX * box2);
-extern bool box_below(BOX * box1, BOX * box2);
-extern bool box_above(BOX * box1, BOX * box2);
-extern bool box_lt(BOX * box1, BOX * box2);
-extern bool box_gt(BOX * box1, BOX * box2);
-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);
-extern Point *box_center(BOX * box);
-extern BOX *box_intersect(BOX * box1, BOX * box2);
-extern LSEG *box_diagonal(BOX * box);
+extern char *box_out(BOX *box);
+extern bool box_same(BOX *box1, BOX *box2);
+extern bool box_overlap(BOX *box1, BOX *box2);
+extern bool box_overleft(BOX *box1, BOX *box2);
+extern bool box_left(BOX *box1, BOX *box2);
+extern bool box_right(BOX *box1, BOX *box2);
+extern bool box_overright(BOX *box1, BOX *box2);
+extern bool box_contained(BOX *box1, BOX *box2);
+extern bool box_contain(BOX *box1, BOX *box2);
+extern bool box_below(BOX *box1, BOX *box2);
+extern bool box_above(BOX *box1, BOX *box2);
+extern bool box_lt(BOX *box1, BOX *box2);
+extern bool box_gt(BOX *box1, BOX *box2);
+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);
+extern Point *box_center(BOX *box);
+extern BOX *box_intersect(BOX *box1, BOX *box2);
+extern LSEG *box_diagonal(BOX *box);
 
 /* private routines */
 
-extern double box_dt(BOX * box1, BOX * box2);
+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_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);
@@ -301,7 +301,7 @@ 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 *box_poly(BOX *box);
 
 extern POLYGON *upgradepoly(POLYGON * poly);
 extern POLYGON *revertpoly(POLYGON * poly);
@@ -341,7 +341,7 @@ 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 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);
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 8e9c184b9c..c84ea24997 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.10 1997/09/08 02:39:50 momjian Exp $
+ * $Id: memutils.h,v 1.11 1997/09/08 20:59:22 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -193,7 +193,7 @@ typedef enum AllocMode
 	StaticAllocMode,			/* always "statically" allocate */
 	TunableAllocMode,			/* allocations are "tuned" */
 	BoundedAllocMode			/* allocations bounded to fixed usage */
-}			AllocMode;
+} AllocMode;
 
 #define DefaultAllocMode		DynamicAllocMode
 
@@ -205,7 +205,7 @@ typedef struct AllocSetData
 {
 	OrderedSetData setData;
 	/* Note: this will change in the future to support other modes */
-}			AllocSetData;
+} AllocSetData;
 
 typedef AllocSetData *AllocSet;
 
@@ -228,7 +228,7 @@ extern void AllocSetReset(AllocSet set);
 extern bool AllocSetContains(AllocSet set, AllocPointer pointer);
 extern AllocPointer AllocSetAlloc(AllocSet set, Size size);
 extern void AllocSetFree(AllocSet set, AllocPointer pointer);
-extern		AllocPointer
+extern AllocPointer
 AllocSetRealloc(AllocSet set, AllocPointer pointer,
 				Size size);
 
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index d6b2fe246f..2258bbbd4a 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.11 1997/09/08 02:40:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.12 1997/09/08 20:59:27 momjian Exp $
  */
 
 #include <float.h>				/* faked on sunos */
@@ -24,7 +24,7 @@ extern PATH *poly2path(POLYGON * poly);
 extern Point *interpt_pp(PATH * p1, PATH * p2);
 extern void regress_lseg_construct(LSEG * lseg, Point * pt1, Point * pt2);
 extern char overpaid(TUPLE tuple);
-extern int	boxarea(BOX * box);
+extern int	boxarea(BOX *box);
 extern char *reverse_c16(char *string);
 
 /*