Another PGINDENT run that changes variable indenting and case label indenting. Also static variable indenting.

242 files changed, 4369 insertions, 4382 deletions

diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h
index 24a757ac3c7..910e07fc111 100644
--- a/src/include/access/attnum.h
+++ b/src/include/access/attnum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: attnum.h,v 1.5 1997/09/07 04:55:45 momjian Exp $
+ * $Id: attnum.h,v 1.6 1997/09/08 02:34:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 /*
  * user defined attribute numbers start at 1.	-ay 2/95
  */
-typedef int16	AttrNumber;
+typedef int16 AttrNumber;
 
 #define InvalidAttrNumber		0
 
diff --git a/src/include/access/funcindex.h b/src/include/access/funcindex.h
index 6257ab97916..9bd92e3a777 100644
--- a/src/include/access/funcindex.h
+++ b/src/include/access/funcindex.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: funcindex.h,v 1.3 1997/09/07 04:55:47 momjian Exp $
+ * $Id: funcindex.h,v 1.4 1997/09/08 02:34:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,11 +15,11 @@
 
 typedef struct
 {
-	int				nargs;
-	Oid				arglist[8];
-	Oid				procOid;
-	NameData		funcName;
-}				FuncIndexInfo;
+	int			nargs;
+	Oid			arglist[8];
+	Oid			procOid;
+	NameData	funcName;
+}			FuncIndexInfo;
 
 typedef FuncIndexInfo *FuncIndexInfoPtr;
 
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 6bb73416c5a..0bdf32bdc84 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.8 1997/09/07 04:55:48 momjian Exp $
+ * $Id: genam.h,v 1.9 1997/09/08 02:34:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,34 +24,34 @@
  */
 extern Relation index_open(Oid relationId);
 extern Relation index_openr(char *relationName);
-extern void		index_close(Relation relation);
-extern InsertIndexResult
+extern void index_close(Relation relation);
+extern		InsertIndexResult
 index_insert(Relation relation,
 			 Datum * datum, char *nulls,
 			 ItemPointer heap_t_ctid,
 			 Relation heapRel);
-extern void		index_delete(Relation relation, ItemPointer indexItem);
-extern IndexScanDesc
+extern void index_delete(Relation relation, ItemPointer indexItem);
+extern		IndexScanDesc
 index_beginscan(Relation relation, bool scanFromEnd,
 				uint16 numberOfKeys, ScanKey key);
-extern void		index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key);
-extern void		index_endscan(IndexScanDesc scan);
-extern RetrieveIndexResult
+extern void index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key);
+extern void index_endscan(IndexScanDesc scan);
+extern		RetrieveIndexResult
 index_getnext(IndexScanDesc scan,
 			  ScanDirection direction);
-extern RegProcedure
+extern		RegProcedure
 index_getprocid(Relation irel, AttrNumber attnum,
 				uint16 procnum);
-extern Datum
+extern		Datum
 GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
 			  int attOff, AttrNumber attrNums[], FuncIndexInfo * fInfo,
 			  bool * attNull, Buffer buffer);
 
 /* in genam.c */
-extern IndexScanDesc
+extern		IndexScanDesc
 RelationGetIndexScan(Relation relation, bool scanFromEnd,
 					 uint16 numberOfKeys, ScanKey key);
-extern void		IndexScanMarkPosition(IndexScanDesc scan);
-extern void		IndexScanRestorePosition(IndexScanDesc scan);
+extern void IndexScanMarkPosition(IndexScanDesc scan);
+extern void IndexScanRestorePosition(IndexScanDesc scan);
 
 #endif							/* GENAM_H */
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index ff21dd50cd1..c80d206cb0c 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -51,8 +51,8 @@
 
 typedef struct GISTPageOpaqueData
 {
-	uint32			flags;
-}				GISTPageOpaqueData;
+	uint32		flags;
+}			GISTPageOpaqueData;
 
 typedef GISTPageOpaqueData *GISTPageOpaque;
 
@@ -65,22 +65,22 @@ typedef GISTPageOpaqueData *GISTPageOpaque;
 typedef struct GISTSTACK
 {
 	struct GISTSTACK *gs_parent;
-	OffsetNumber	gs_child;
-	BlockNumber		gs_blk;
-}				GISTSTACK;
+	OffsetNumber gs_child;
+	BlockNumber gs_blk;
+}			GISTSTACK;
 
 typedef struct GISTSTATE
 {
-	func_ptr		consistentFn;
-	func_ptr		unionFn;
-	func_ptr		compressFn;
-	func_ptr		decompressFn;
-	func_ptr		penaltyFn;
-	func_ptr		picksplitFn;
-	func_ptr		equalFn;
-	bool			haskeytype;
-	bool			keytypbyval;
-}				GISTSTATE;
+	func_ptr	consistentFn;
+	func_ptr	unionFn;
+	func_ptr	compressFn;
+	func_ptr	decompressFn;
+	func_ptr	penaltyFn;
+	func_ptr	picksplitFn;
+	func_ptr	equalFn;
+	bool		haskeytype;
+	bool		keytypbyval;
+}			GISTSTATE;
 
 
 /*
@@ -92,9 +92,9 @@ typedef struct GISTScanOpaqueData
 {
 	struct GISTSTACK *s_stack;
 	struct GISTSTACK *s_markstk;
-	uint16			s_flags;
+	uint16		s_flags;
 	struct GISTSTATE *giststate;
-}				GISTScanOpaqueData;
+}			GISTScanOpaqueData;
 
 typedef GISTScanOpaqueData *GISTScanOpaque;
 
@@ -128,13 +128,13 @@ typedef GISTScanOpaqueData *GISTScanOpaque;
 */
 typedef struct GIST_SPLITVEC
 {
-	OffsetNumber   *spl_left;	/* array of entries that go left */
-	int				spl_nleft;	/* size of this array */
-	char		   *spl_ldatum; /* Union of keys in spl_left */
-	OffsetNumber   *spl_right;	/* array of entries that go right */
-	int				spl_nright; /* size of the array */
-	char		   *spl_rdatum; /* Union of keys in spl_right */
-}				GIST_SPLITVEC;
+	OffsetNumber *spl_left;		/* array of entries that go left */
+	int			spl_nleft;		/* size of this array */
+	char	   *spl_ldatum;		/* Union of keys in spl_left */
+	OffsetNumber *spl_right;	/* array of entries that go right */
+	int			spl_nright;		/* size of the array */
+	char	   *spl_rdatum;		/* Union of keys in spl_right */
+}			GIST_SPLITVEC;
 
 /*
 ** An entry on a GiST node.  Contains the key (pred), as well as
@@ -144,13 +144,13 @@ typedef struct GIST_SPLITVEC
 */
 typedef struct GISTENTRY
 {
-	char		   *pred;
-	Relation		rel;
-	Page			page;
-	OffsetNumber	offset;
-	int				bytes;
-	bool			leafkey;
-}				GISTENTRY;
+	char	   *pred;
+	Relation	rel;
+	Page		page;
+	OffsetNumber offset;
+	int			bytes;
+	bool		leafkey;
+}			GISTENTRY;
 
 /*
 ** macro to initialize a GISTENTRY
@@ -169,22 +169,22 @@ typedef struct txtrange
 	 * flag: NINF means that lower is negative infinity; PINF means that *
 	 * upper is positive infinity.	0 means that both are numbers.
 	 */
-	int32			vl_len;
-	int32			flag;
-	char			bytes[2];
-}				TXTRANGE;
+	int32		vl_len;
+	int32		flag;
+	char		bytes[2];
+}			TXTRANGE;
 
 typedef struct intrange
 {
-	int				lower;
-	int				upper;
+	int			lower;
+	int			upper;
 
 	/*
 	 * flag: NINF means that lower is negative infinity; PINF means that *
 	 * upper is positive infinity.	0 means that both are numbers.
 	 */
-	int				flag;
-}				INTRANGE;
+	int			flag;
+}			INTRANGE;
 
 extern void
 gistbuild(Relation heap,
@@ -193,12 +193,12 @@ gistbuild(Relation heap,
 		  uint16 pint, Datum * params,
 		  FuncIndexInfo * finfo,
 		  PredInfo * predInfo);
-extern InsertIndexResult
+extern		InsertIndexResult
 gistinsert(Relation r, Datum * datum,
 		   char *nulls, ItemPointer ht_ctid, Relation heapRel);
-extern void		_gistdump(Relation r);
-extern void		gistfreestack(GISTSTACK * s);
-extern void		initGISTstate(GISTSTATE * giststate, Relation index);
+extern void _gistdump(Relation r);
+extern void gistfreestack(GISTSTACK * s);
+extern void initGISTstate(GISTSTATE * giststate, Relation index);
 extern void
 gistdentryinit(GISTSTATE * giststate, GISTENTRY * e, char *pr,
 			   Relation r, Page pg, OffsetNumber o, int b, bool l);
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index 46aa621631d..a5a5f782198 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -16,13 +16,13 @@
 #include <storage/block.h>
 #include <utils/rel.h>
 
-extern IndexScanDesc
+extern		IndexScanDesc
 gistbeginscan(Relation r, bool fromEnd,
 			  uint16 nkeys, ScanKey key);
-extern void		gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
-extern void		gistmarkpos(IndexScanDesc s);
-extern void		gistrestrpos(IndexScanDesc s);
-extern void		gistendscan(IndexScanDesc s);
-extern void		gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
+extern void gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
+extern void gistmarkpos(IndexScanDesc s);
+extern void gistrestrpos(IndexScanDesc s);
+extern void gistendscan(IndexScanDesc s);
+extern void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
 
 #endif							/* GISTSCAN_H */
diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h
index 1007dd3ec26..42bdf847aef 100644
--- a/src/include/access/giststrat.h
+++ b/src/include/access/giststrat.h
@@ -15,7 +15,7 @@
 #include <access/strat.h>
 #include <utils/rel.h>
 
-extern StrategyNumber
+extern		StrategyNumber
 RelationGetGISTStrategy(Relation r,
 						AttrNumber attnum, RegProcedure proc);
 
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 14fd50c34cf..f9b93e0de77 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.8 1997/09/07 04:55:54 momjian Exp $
+ * $Id: hash.h,v 1.9 1997/09/08 02:34:08 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -39,10 +39,10 @@
  * macro OADDR_OF(S, O) where S is the splitnumber and O is the page
  * offset.
  */
-typedef uint32	Bucket;
-typedef bits16	OverflowPageAddress;
-typedef uint32	SplitNumber;
-typedef uint32	PageOffset;
+typedef uint32 Bucket;
+typedef bits16 OverflowPageAddress;
+typedef uint32 SplitNumber;
+typedef uint32 PageOffset;
 
 /* A valid overflow address will always have a page offset >= 1 */
 #define InvalidOvflAddress		0
@@ -77,13 +77,12 @@ typedef uint32	PageOffset;
 
 typedef struct HashPageOpaqueData
 {
-	bits16			hasho_flag; /* is this page a bucket or ovfl */
-	Bucket			hasho_bucket;		/* bucket number this pg belongs
-										 * to */
+	bits16		hasho_flag;		/* is this page a bucket or ovfl */
+	Bucket		hasho_bucket;	/* bucket number this pg belongs to */
 	OverflowPageAddress hasho_oaddr;	/* ovfl address of this ovfl pg */
-	BlockNumber		hasho_nextblkno;	/* next ovfl blkno */
-	BlockNumber		hasho_prevblkno;	/* previous ovfl (or bucket) blkno */
-}				HashPageOpaqueData;
+	BlockNumber hasho_nextblkno;/* next ovfl blkno */
+	BlockNumber hasho_prevblkno;/* previous ovfl (or bucket) blkno */
+}			HashPageOpaqueData;
 
 typedef HashPageOpaqueData *HashPageOpaque;
 
@@ -97,9 +96,9 @@ typedef HashPageOpaqueData *HashPageOpaque;
 
 typedef struct HashScanOpaqueData
 {
-	Buffer			hashso_curbuf;
-	Buffer			hashso_mrkbuf;
-}				HashScanOpaqueData;
+	Buffer		hashso_curbuf;
+	Buffer		hashso_mrkbuf;
+}			HashScanOpaqueData;
 
 typedef HashScanOpaqueData *HashScanOpaque;
 
@@ -140,31 +139,28 @@ typedef HashScanOpaqueData *HashScanOpaque;
 
 typedef struct HashMetaPageData
 {
-	PageHeaderData	hashm_phdr; /* pad for page header (do not use) */
-	uint32			hashm_magic;/* magic no. for hash tables */
-	uint32			hashm_version;		/* version ID */
-	uint32			hashm_nkeys;/* number of keys stored in the table */
-	uint16			hashm_ffactor;		/* fill factor */
-	uint16			hashm_bsize;/* bucket size (bytes) - must be a power
+	PageHeaderData hashm_phdr;	/* pad for page header (do not use) */
+	uint32		hashm_magic;	/* magic no. for hash tables */
+	uint32		hashm_version;	/* version ID */
+	uint32		hashm_nkeys;	/* number of keys stored in the table */
+	uint16		hashm_ffactor;	/* fill factor */
+	uint16		hashm_bsize;	/* bucket size (bytes) - must be a power
 								 * of 2 */
-	uint16			hashm_bshift;		/* bucket shift */
-	uint16			hashm_bmsize;		/* bitmap array size (bytes) -
-										 * must be a power of 2 */
-	uint32			hashm_maxbucket;	/* ID of maximum bucket in use */
-	uint32			hashm_highmask;		/* mask to modulo into entire
-										 * table */
-	uint32			hashm_lowmask;		/* mask to modulo into lower half
-										 * of table */
-	uint32			hashm_ovflpoint;	/* pageno. from which ovflpgs
-										 * being allocated */
-	uint32			hashm_lastfreed;	/* last ovflpage freed */
-	uint32			hashm_nmaps;/* Initial number of bitmaps */
-	uint32			hashm_spares[NCACHED];		/* spare pages available
-												 * at splitpoints */
-	BlockNumber		hashm_mapp[NCACHED];		/* blknumbers of ovfl page
-												 * maps */
-	RegProcedure	hashm_procid;		/* hash procedure id from pg_proc */
-}				HashMetaPageData;
+	uint16		hashm_bshift;	/* bucket shift */
+	uint16		hashm_bmsize;	/* bitmap array size (bytes) - must be a
+								 * power of 2 */
+	uint32		hashm_maxbucket;/* ID of maximum bucket in use */
+	uint32		hashm_highmask; /* mask to modulo into entire table */
+	uint32		hashm_lowmask;	/* mask to modulo into lower half of table */
+	uint32		hashm_ovflpoint;/* pageno. from which ovflpgs being
+								 * allocated */
+	uint32		hashm_lastfreed;/* last ovflpage freed */
+	uint32		hashm_nmaps;	/* Initial number of bitmaps */
+	uint32		hashm_spares[NCACHED];	/* spare pages available at
+										 * splitpoints */
+	BlockNumber hashm_mapp[NCACHED];	/* blknumbers of ovfl page maps */
+	RegProcedure hashm_procid;	/* hash procedure id from pg_proc */
+}			HashMetaPageData;
 
 typedef HashMetaPageData *HashMetaPage;
 
@@ -179,12 +175,12 @@ typedef HashMetaPageData *HashMetaPage;
 #define NKEYS			hashm_nkeys
 #define SPARES			hashm_spares
 
-extern bool		BuildingHash;
+extern bool BuildingHash;
 
 typedef struct HashItemData
 {
-	IndexTupleData	hash_itup;
-}				HashItemData;
+	IndexTupleData hash_itup;
+}			HashItemData;
 
 typedef HashItemData *HashItem;
 
@@ -256,32 +252,32 @@ extern void
 hashbuild(Relation heap, Relation index, int natts,
 		  AttrNumber * attnum, IndexStrategy istrat, uint16 pcount,
 		  Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
-extern InsertIndexResult
+extern		InsertIndexResult
 hashinsert(Relation rel, Datum * datum, char *nulls,
 		   ItemPointer ht_ctid, Relation heapRel);
-extern char    *hashgettuple(IndexScanDesc scan, ScanDirection dir);
-extern char    *
+extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir);
+extern char *
 hashbeginscan(Relation rel, bool fromEnd, uint16 keysz,
 			  ScanKey scankey);
-extern void		hashrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey);
-extern void		hashendscan(IndexScanDesc scan);
-extern void		hashmarkpos(IndexScanDesc scan);
-extern void		hashrestrpos(IndexScanDesc scan);
-extern void		hashdelete(Relation rel, ItemPointer tid);
+extern void hashrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey);
+extern void hashendscan(IndexScanDesc scan);
+extern void hashmarkpos(IndexScanDesc scan);
+extern void hashrestrpos(IndexScanDesc scan);
+extern void hashdelete(Relation rel, ItemPointer tid);
 
 /* hashfunc.c */
-extern uint32	hashint2(int16 key);
-extern uint32	hashint4(uint32 key);
-extern uint32	hashfloat4(float32 keyp);
-extern uint32	hashfloat8(float64 keyp);
-extern uint32	hashoid(Oid key);
-extern uint32	hashchar(char key);
-extern uint32	hashchar2(uint16 intkey);
-extern uint32	hashchar4(uint32 intkey);
-extern uint32	hashchar8(char *key);
-extern uint32	hashchar16(char *key);
-extern uint32	hashtext(struct varlena * key);
-extern uint32	hashname(NameData * n);
+extern uint32 hashint2(int16 key);
+extern uint32 hashint4(uint32 key);
+extern uint32 hashfloat4(float32 keyp);
+extern uint32 hashfloat8(float64 keyp);
+extern uint32 hashoid(Oid key);
+extern uint32 hashchar(char key);
+extern uint32 hashchar2(uint16 intkey);
+extern uint32 hashchar4(uint32 intkey);
+extern uint32 hashchar8(char *key);
+extern uint32 hashchar16(char *key);
+extern uint32 hashtext(struct varlena * key);
+extern uint32 hashname(NameData * n);
 
 /* private routines */
 
@@ -290,9 +286,9 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem);
 
 
 /* hashovfl.c */
-extern Buffer	_hash_addovflpage(Relation rel, Buffer * metabufp, Buffer buf);
-extern Buffer	_hash_freeovflpage(Relation rel, Buffer ovflbuf);
-extern int32
+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,
 				 int32 nbits, int32 ndx);
 extern void
@@ -301,23 +297,23 @@ _hash_squeezebucket(Relation rel, HashMetaPage metap,
 
 
 /* hashpage.c */
-extern void		_hash_metapinit(Relation rel);
-extern Buffer	_hash_getbuf(Relation rel, BlockNumber blkno, int access);
-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
+extern void _hash_metapinit(Relation rel);
+extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno, int access);
+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,
 				   int to_access);
-extern void		_hash_pageinit(Page page, Size size);
-extern void		_hash_pagedel(Relation rel, ItemPointer tid);
-extern void		_hash_expandtable(Relation rel, Buffer metabuf);
+extern void _hash_pageinit(Page page, Size size);
+extern void _hash_pagedel(Relation rel, ItemPointer tid);
+extern void _hash_expandtable(Relation rel, Buffer metabuf);
 
 
 /* hashscan.c */
-extern void		_hash_regscan(IndexScanDesc scan);
-extern void		_hash_dropscan(IndexScanDesc scan);
-extern void		_hash_adjscans(Relation rel, ItemPointer tid);
+extern void _hash_regscan(IndexScanDesc scan);
+extern void _hash_dropscan(IndexScanDesc scan);
+extern void _hash_adjscans(Relation rel, ItemPointer tid);
 
 
 /* hashsearch.c */
@@ -326,20 +322,20 @@ _hash_search(Relation rel, int keysz, ScanKey scankey,
 			 Buffer * bufP, HashMetaPage metap);
 extern RetrieveIndexResult _hash_next(IndexScanDesc scan, ScanDirection dir);
 extern RetrieveIndexResult _hash_first(IndexScanDesc scan, ScanDirection dir);
-extern bool
+extern		bool
 _hash_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir,
 		   Buffer metabuf);
 
 
 /* hashutil.c */
-extern ScanKey
+extern		ScanKey
 _hash_mkscankey(Relation rel, IndexTuple itup,
 				HashMetaPage metap);
-extern void		_hash_freeskey(ScanKey skey);
-extern bool		_hash_checkqual(IndexScanDesc scan, IndexTuple itup);
+extern void _hash_freeskey(ScanKey skey);
+extern bool _hash_checkqual(IndexScanDesc scan, IndexTuple itup);
 extern HashItem _hash_formitem(IndexTuple itup);
-extern Bucket	_hash_call(Relation rel, HashMetaPage metap, Datum key);
-extern uint32	_hash_log2(uint32 num);
-extern void		_hash_checkpage(Page page, int flags);
+extern Bucket _hash_call(Relation rel, HashMetaPage metap, Datum key);
+extern uint32 _hash_log2(uint32 num);
+extern void _hash_checkpage(Page page, int flags);
 
 #endif							/* HASH_H */
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 15f5685e86a..c82b23e742c 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.12 1997/09/07 04:55:55 momjian Exp $
+ * $Id: heapam.h,v 1.13 1997/09/08 02:34:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,57 +25,54 @@
 
 typedef struct HeapAccessStatisticsData
 {
-	time_t			init_global_timestamp;		/* time global statistics
-												 * started */
-	time_t			local_reset_timestamp;		/* last time local reset
-												 * was done */
-	time_t			last_request_timestamp;		/* last time stats were
-												 * requested */
-
-	int				global_open;
-	int				global_openr;
-	int				global_close;
-	int				global_beginscan;
-	int				global_rescan;
-	int				global_endscan;
-	int				global_getnext;
-	int				global_fetch;
-	int				global_insert;
-	int				global_delete;
-	int				global_replace;
-	int				global_markpos;
-	int				global_restrpos;
-	int				global_BufferGetRelation;
-	int				global_RelationIdGetRelation;
-	int				global_RelationIdGetRelation_Buf;
-	int				global_RelationNameGetRelation;
-	int				global_getreldesc;
-	int				global_heapgettup;
-	int				global_RelationPutHeapTuple;
-	int				global_RelationPutLongHeapTuple;
-
-	int				local_open;
-	int				local_openr;
-	int				local_close;
-	int				local_beginscan;
-	int				local_rescan;
-	int				local_endscan;
-	int				local_getnext;
-	int				local_fetch;
-	int				local_insert;
-	int				local_delete;
-	int				local_replace;
-	int				local_markpos;
-	int				local_restrpos;
-	int				local_BufferGetRelation;
-	int				local_RelationIdGetRelation;
-	int				local_RelationIdGetRelation_Buf;
-	int				local_RelationNameGetRelation;
-	int				local_getreldesc;
-	int				local_heapgettup;
-	int				local_RelationPutHeapTuple;
-	int				local_RelationPutLongHeapTuple;
-}				HeapAccessStatisticsData;
+	time_t		init_global_timestamp;	/* time global statistics started */
+	time_t		local_reset_timestamp;	/* last time local reset was done */
+	time_t		last_request_timestamp; /* last time stats were requested */
+
+	int			global_open;
+	int			global_openr;
+	int			global_close;
+	int			global_beginscan;
+	int			global_rescan;
+	int			global_endscan;
+	int			global_getnext;
+	int			global_fetch;
+	int			global_insert;
+	int			global_delete;
+	int			global_replace;
+	int			global_markpos;
+	int			global_restrpos;
+	int			global_BufferGetRelation;
+	int			global_RelationIdGetRelation;
+	int			global_RelationIdGetRelation_Buf;
+	int			global_RelationNameGetRelation;
+	int			global_getreldesc;
+	int			global_heapgettup;
+	int			global_RelationPutHeapTuple;
+	int			global_RelationPutLongHeapTuple;
+
+	int			local_open;
+	int			local_openr;
+	int			local_close;
+	int			local_beginscan;
+	int			local_rescan;
+	int			local_endscan;
+	int			local_getnext;
+	int			local_fetch;
+	int			local_insert;
+	int			local_delete;
+	int			local_replace;
+	int			local_markpos;
+	int			local_restrpos;
+	int			local_BufferGetRelation;
+	int			local_RelationIdGetRelation;
+	int			local_RelationIdGetRelation_Buf;
+	int			local_RelationNameGetRelation;
+	int			local_getreldesc;
+	int			local_heapgettup;
+	int			local_RelationPutHeapTuple;
+	int			local_RelationPutLongHeapTuple;
+}			HeapAccessStatisticsData;
 
 typedef HeapAccessStatisticsData *HeapAccessStatistics;
 
@@ -115,58 +112,58 @@ extern HeapAccessStatistics heap_access_stats;	/* in stats.c */
 /* heap_create, heap_creatr, and heap_destroy are declared in catalog/heap.h */
 
 /* heapam.c */
-extern void		doinsert(Relation relation, HeapTuple tup);
+extern void doinsert(Relation relation, HeapTuple tup);
 
 extern Relation heap_open(Oid relationId);
 extern Relation heap_openr(char *relationName);
-extern void		heap_close(Relation relation);
-extern HeapScanDesc
+extern void heap_close(Relation relation);
+extern		HeapScanDesc
 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 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
+extern		HeapTuple
 heap_fetch(Relation relation, TimeQual timeQual,
 		   ItemPointer tid, Buffer * b);
-extern Oid		heap_insert(Relation relation, HeapTuple tup);
-extern int		heap_delete(Relation relation, ItemPointer tid);
+extern Oid	heap_insert(Relation relation, HeapTuple tup);
+extern int	heap_delete(Relation relation, ItemPointer tid);
 extern int
 heap_replace(Relation relation, ItemPointer otid,
 			 HeapTuple tup);
-extern void		heap_markpos(HeapScanDesc sdesc);
-extern void		heap_restrpos(HeapScanDesc sdesc);
+extern void heap_markpos(HeapScanDesc sdesc);
+extern void heap_restrpos(HeapScanDesc sdesc);
 
 /* in common/heaptuple.c */
-extern Size		ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]);
+extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]);
 extern void
 DataFill(char *data, TupleDesc tupleDesc,
 		 Datum value[], char nulls[], char *infomask,
 		 bits8 * bit);
-extern int		heap_attisnull(HeapTuple tup, int attnum);
-extern int		heap_sysattrlen(AttrNumber attno);
-extern bool		heap_sysattrbyval(AttrNumber attno);
-extern char    *heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
-extern char    *
+extern int	heap_attisnull(HeapTuple tup, int attnum);
+extern int	heap_sysattrlen(AttrNumber attno);
+extern bool heap_sysattrbyval(AttrNumber attno);
+extern char *heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
+extern char *
 fastgetattr(HeapTuple tup, int attnum,
 			TupleDesc att, bool * isnull);
 extern HeapTuple heap_copytuple(HeapTuple tuple);
-extern HeapTuple
+extern		HeapTuple
 heap_formtuple(TupleDesc tupleDescriptor,
 			   Datum value[], char nulls[]);
-extern HeapTuple
+extern		HeapTuple
 heap_modifytuple(HeapTuple tuple, Buffer buffer,
 	 Relation relation, Datum replValue[], char replNull[], char repl[]);
-HeapTuple		heap_addheader(uint32 natts, int structlen, char *structure);
+HeapTuple	heap_addheader(uint32 natts, int structlen, char *structure);
 
 /* in common/heap/stats.c */
-extern void		PrintHeapAccessStatistics(HeapAccessStatistics stats);
-extern void		initam(void);
+extern void PrintHeapAccessStatistics(HeapAccessStatistics stats);
+extern void initam(void);
 
 /* hio.c */
 extern void
 RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
 					 HeapTuple tuple);
-extern void		RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
+extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
 
 #endif							/* HEAPAM_H */
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index 05c9dc330c9..e4bd0404f64 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hio.h,v 1.4 1997/09/07 04:55:56 momjian Exp $
+ * $Id: hio.h,v 1.5 1997/09/08 02:34:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,6 @@
 extern void
 RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
 					 HeapTuple tuple);
-extern void		RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
+extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
 
 #endif							/* HIO_H */
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 02d708bb0ad..3b6b32b98f9 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: htup.h,v 1.4 1997/09/07 04:55:58 momjian Exp $
+ * $Id: htup.h,v 1.5 1997/09/08 02:34:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,36 +29,36 @@
 typedef struct HeapTupleData
 {
 
-	unsigned int	t_len;		/* length of entire tuple */
+	unsigned int t_len;			/* length of entire tuple */
 
 	ItemPointerData t_ctid;		/* current TID of this tuple */
 
 	ItemPointerData t_chain;	/* replaced tuple TID */
 
-	Oid				t_oid;		/* OID of this tuple -- 4 bytes */
+	Oid			t_oid;			/* OID of this tuple -- 4 bytes */
 
-	CommandId		t_cmin;		/* insert CID stamp -- 2 bytes each */
-	CommandId		t_cmax;		/* delete CommandId stamp */
+	CommandId	t_cmin;			/* insert CID stamp -- 2 bytes each */
+	CommandId	t_cmax;			/* delete CommandId stamp */
 
-	TransactionId	t_xmin;		/* insert XID stamp -- 4 bytes each */
-	TransactionId	t_xmax;		/* delete XID stamp */
+	TransactionId t_xmin;		/* insert XID stamp -- 4 bytes each */
+	TransactionId t_xmax;		/* delete XID stamp */
 
-	AbsoluteTime	t_tmin;		/* time stamps -- 4 bytes each */
-	AbsoluteTime	t_tmax;
+	AbsoluteTime t_tmin;		/* time stamps -- 4 bytes each */
+	AbsoluteTime t_tmax;
 
-	int16			t_natts;	/* number of attributes */
-	char			t_vtype;	/* not used - padding */
+	int16		t_natts;		/* number of attributes */
+	char		t_vtype;		/* not used - padding */
 
-	char			t_infomask; /* whether tuple as null or variable
+	char		t_infomask;		/* whether tuple as null or variable
 								 * length attributes */
 
-	uint8			t_hoff;		/* sizeof tuple header */
+	uint8		t_hoff;			/* sizeof tuple header */
 
-	bits8			t_bits[MinHeapTupleBitmapSize / 8];
+	bits8		t_bits[MinHeapTupleBitmapSize / 8];
 	/* bit map of domains */
 
 	/* MORE DATA FOLLOWS AT END OF STRUCT */
-}				HeapTupleData;
+}			HeapTupleData;
 
 typedef HeapTupleData *HeapTuple;
 
diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index 87e2fec53fd..6b1bc08dce1 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ibit.h,v 1.5 1997/09/07 04:56:01 momjian Exp $
+ * $Id: ibit.h,v 1.6 1997/09/08 02:34:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,9 +17,9 @@
 
 typedef struct IndexAttributeBitMapData
 {
-	char			bits[(MaxIndexAttributeNumber + MaxBitsPerByte - 1)
-						 /				 MaxBitsPerByte];
-}				IndexAttributeBitMapData;
+	char		bits[(MaxIndexAttributeNumber + MaxBitsPerByte - 1)
+					 /			 MaxBitsPerByte];
+}			IndexAttributeBitMapData;
 
 typedef IndexAttributeBitMapData *IndexAttributeBitMap;
 
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index 233c2f61f87..20fc9ecee3e 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: iqual.h,v 1.5 1997/09/07 04:56:04 momjian Exp $
+ * $Id: iqual.h,v 1.6 1997/09/08 02:34:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,9 @@
  * ----------------
  */
 
-extern int		NIndexTupleProcessed;
+extern int	NIndexTupleProcessed;
 
-extern bool
+extern		bool
 index_keytest(IndexTuple tuple, TupleDesc tupdesc,
 			  int scanKeySize, ScanKey key);
 
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 377a8463446..fa1ea6396f6 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.6 1997/09/07 04:56:05 momjian Exp $
+ * $Id: istrat.h,v 1.7 1997/09/08 02:34:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,18 +47,18 @@
  */
 #define IndexStrategyIsValid(s) PointerIsValid(s)
 
-extern StrategyMap
+extern		StrategyMap
 IndexStrategyGetStrategyMap(IndexStrategy indexStrategy,
 					  StrategyNumber maxStrategyNum, AttrNumber attrNum);
 
-extern			Size
+extern		Size
 AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
 									StrategyNumber maxStrategyNumber);
-extern StrategyNumber
+extern		StrategyNumber
 RelationGetStrategy(Relation relation,
 			   AttrNumber attributeNumber, StrategyEvaluation evaluation,
 					RegProcedure procedure);
-extern bool
+extern		bool
 RelationInvokeStrategy(Relation relation,
 			   StrategyEvaluation evaluation, AttrNumber attributeNumber,
 					   StrategyNumber strategy, Datum left, Datum right);
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 742078a3bd1..09249822518 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.6 1997/09/07 04:56:05 momjian Exp $
+ * $Id: itup.h,v 1.7 1997/09/08 02:34:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,14 +30,14 @@ typedef struct IndexTupleData
 	 * tuple.
 	 */
 
-	unsigned short	t_info;		/* various info about tuple */
+	unsigned short t_info;		/* various info about tuple */
 
 	/*
 	 * please make sure sizeof(IndexTupleData) is MAXALIGN'ed. See
 	 * IndexInfoFindDataOffset() for the reason.
 	 */
 
-}				IndexTupleData; /* MORE DATA FOLLOWS AT END OF STRUCT */
+}			IndexTupleData;		/* MORE DATA FOLLOWS AT END OF STRUCT */
 
 typedef IndexTupleData *IndexTuple;
 
@@ -45,7 +45,7 @@ typedef IndexTupleData *IndexTuple;
 typedef struct InsertIndexResultData
 {
 	ItemPointerData pointerData;
-}				InsertIndexResultData;
+}			InsertIndexResultData;
 
 typedef InsertIndexResultData *InsertIndexResult;
 
@@ -54,7 +54,7 @@ typedef struct RetrieveIndexResultData
 {
 	ItemPointerData index_iptr;
 	ItemPointerData heap_iptr;
-}				RetrieveIndexResultData;
+}			RetrieveIndexResultData;
 
 typedef RetrieveIndexResultData *RetrieveIndexResult;
 
@@ -66,9 +66,9 @@ typedef RetrieveIndexResultData *RetrieveIndexResult;
  */
 typedef struct PredInfo
 {
-	Node		   *pred;
-	Node		   *oldPred;
-}				PredInfo;
+	Node	   *pred;
+	Node	   *oldPred;
+}			PredInfo;
 
 
 /* ----------------
@@ -89,16 +89,16 @@ typedef struct PredInfo
 
 
 /* indextuple.h */
-extern IndexTuple
+extern		IndexTuple
 index_formtuple(TupleDesc tupleDescriptor,
 				Datum value[], char null[]);
-extern Datum
+extern		Datum
 index_getattr(IndexTuple tuple, AttrNumber attNum,
 			  TupleDesc tupDesc, bool * isNullOutP);
-extern			RetrieveIndexResult
+extern		RetrieveIndexResult
 FormRetrieveIndexResult(ItemPointer indexItemPointer,
 						ItemPointer heapItemPointer);
-extern void		CopyIndexTuple(IndexTuple source, IndexTuple * target);
+extern void CopyIndexTuple(IndexTuple source, IndexTuple * target);
 
 
 #endif							/* ITUP_H */
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 0062431d6cb..813e557d55c 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.15 1997/09/07 04:56:06 momjian Exp $
+ * $Id: nbtree.h,v 1.16 1997/09/08 02:34:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,9 +40,9 @@
 
 typedef struct BTPageOpaqueData
 {
-	BlockNumber		btpo_prev;
-	BlockNumber		btpo_next;
-	uint16			btpo_flags;
+	BlockNumber btpo_prev;
+	BlockNumber btpo_next;
+	uint16		btpo_flags;
 
 #define BTP_LEAF		(1 << 0)
 #define BTP_ROOT		(1 << 1)
@@ -50,7 +50,7 @@ typedef struct BTPageOpaqueData
 #define BTP_META		(1 << 3)
 #define BTP_CHAIN		(1 << 4)
 
-}				BTPageOpaqueData;
+}			BTPageOpaqueData;
 
 typedef BTPageOpaqueData *BTPageOpaque;
 
@@ -67,14 +67,14 @@ typedef BTPageOpaqueData *BTPageOpaque;
 
 typedef struct BTScanOpaqueData
 {
-	Buffer			btso_curbuf;
-	Buffer			btso_mrkbuf;
-	uint16			qual_ok;	/* 0 for quals like key == 1 && key > 2 */
-	uint16			numberOfKeys;		/* number of keys */
-	uint16			numberOfFirstKeys;	/* number of keys for 1st
+	Buffer		btso_curbuf;
+	Buffer		btso_mrkbuf;
+	uint16		qual_ok;		/* 0 for quals like key == 1 && key > 2 */
+	uint16		numberOfKeys;	/* number of keys */
+	uint16		numberOfFirstKeys;		/* number of keys for 1st
 										 * attribute */
-	ScanKey			keyData;	/* key descriptor */
-}				BTScanOpaqueData;
+	ScanKey		keyData;		/* key descriptor */
+}			BTScanOpaqueData;
 
 typedef BTScanOpaqueData *BTScanOpaque;
 
@@ -99,12 +99,12 @@ typedef BTScanOpaqueData *BTScanOpaque;
 typedef struct BTItemData
 {
 #ifndef BTREE_VERSION_1
-	Oid				bti_oid;
-	int32			bti_dummy;	/* padding to make bti_itup align at
+	Oid			bti_oid;
+	int32		bti_dummy;		/* padding to make bti_itup align at
 								 * 8-byte boundary */
 #endif
-	IndexTupleData	bti_itup;
-}				BTItemData;
+	IndexTupleData bti_itup;
+}			BTItemData;
 
 typedef BTItemData *BTItem;
 
@@ -131,25 +131,25 @@ typedef BTItemData *BTItem;
 
 typedef struct BTStackData
 {
-	BlockNumber		bts_blkno;
-	OffsetNumber	bts_offset;
-	BTItem			bts_btitem;
+	BlockNumber bts_blkno;
+	OffsetNumber bts_offset;
+	BTItem		bts_btitem;
 	struct BTStackData *bts_parent;
-}				BTStackData;
+}			BTStackData;
 
 typedef BTStackData *BTStack;
 
 typedef struct BTPageState
 {
-	Buffer			btps_buf;
-	Page			btps_page;
-	BTItem			btps_lastbti;
-	OffsetNumber	btps_lastoff;
-	OffsetNumber	btps_firstoff;
-	int				btps_level;
-	bool			btps_doupper;
+	Buffer		btps_buf;
+	Page		btps_page;
+	BTItem		btps_lastbti;
+	OffsetNumber btps_lastoff;
+	OffsetNumber btps_firstoff;
+	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
@@ -213,105 +213,105 @@ typedef struct BTPageState
 /*
  * prototypes for functions in nbtinsert.c
  */
-extern InsertIndexResult
+extern		InsertIndexResult
 _bt_doinsert(Relation rel, BTItem btitem,
 			 bool index_is_unique, Relation heapRel);
 
  /* default is to allow duplicates */
-extern bool
+extern		bool
 _bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2,
 			StrategyNumber strat);
 
 /*
  * prototypes for functions in nbtpage.c
  */
-extern void		_bt_metapinit(Relation rel);
-extern Buffer	_bt_getroot(Relation rel, int access);
-extern Buffer	_bt_getbuf(Relation rel, BlockNumber blkno, int access);
-extern void		_bt_relbuf(Relation rel, Buffer buf, int access);
-extern void		_bt_wrtbuf(Relation rel, Buffer buf);
-extern void		_bt_wrtnorelbuf(Relation rel, Buffer buf);
-extern void		_bt_pageinit(Page page, Size size);
-extern void		_bt_metaproot(Relation rel, BlockNumber rootbknum, int level);
-extern Buffer	_bt_getstackbuf(Relation rel, BTStack stack, int access);
-extern void		_bt_pagedel(Relation rel, ItemPointer tid);
+extern void _bt_metapinit(Relation rel);
+extern Buffer _bt_getroot(Relation rel, int access);
+extern Buffer _bt_getbuf(Relation rel, BlockNumber blkno, int access);
+extern void _bt_relbuf(Relation rel, Buffer buf, int access);
+extern void _bt_wrtbuf(Relation rel, Buffer buf);
+extern void _bt_wrtnorelbuf(Relation rel, Buffer buf);
+extern void _bt_pageinit(Page page, Size size);
+extern void _bt_metaproot(Relation rel, BlockNumber rootbknum, int level);
+extern Buffer _bt_getstackbuf(Relation rel, BTStack stack, int access);
+extern void _bt_pagedel(Relation rel, ItemPointer tid);
 
 /*
  * prototypes for functions in nbtree.c
  */
-extern bool		BuildingBtree;	/* in nbtree.c */
+extern bool BuildingBtree;		/* in nbtree.c */
 
 extern void
 btbuild(Relation heap, Relation index, int natts,
 		AttrNumber * attnum, IndexStrategy istrat, uint16 pcount,
 		Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
-extern InsertIndexResult
+extern		InsertIndexResult
 btinsert(Relation rel, Datum * datum, char *nulls,
 		 ItemPointer ht_ctid, Relation heapRel);
-extern char    *btgettuple(IndexScanDesc scan, ScanDirection dir);
-extern char    *
+extern char *btgettuple(IndexScanDesc scan, ScanDirection dir);
+extern char *
 btbeginscan(Relation rel, bool fromEnd, uint16 keysz,
 			ScanKey scankey);
 
-extern void		btrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey);
-extern void		btmovescan(IndexScanDesc scan, Datum v);
-extern void		btendscan(IndexScanDesc scan);
-extern void		btmarkpos(IndexScanDesc scan);
-extern void		btrestrpos(IndexScanDesc scan);
-extern void		btdelete(Relation rel, ItemPointer tid);
+extern void btrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey);
+extern void btmovescan(IndexScanDesc scan, Datum v);
+extern void btendscan(IndexScanDesc scan);
+extern void btmarkpos(IndexScanDesc scan);
+extern void btrestrpos(IndexScanDesc scan);
+extern void btdelete(Relation rel, ItemPointer tid);
 
 /*
  * prototypes for functions in nbtscan.c
  */
-extern void		_bt_regscan(IndexScanDesc scan);
-extern void		_bt_dropscan(IndexScanDesc scan);
-extern void		_bt_adjscans(Relation rel, ItemPointer tid, int op);
+extern void _bt_regscan(IndexScanDesc scan);
+extern void _bt_dropscan(IndexScanDesc scan);
+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
+extern		Buffer
 _bt_moveright(Relation rel, Buffer buf, int keysz,
 			  ScanKey scankey, int access);
-extern bool
+extern		bool
 _bt_skeycmp(Relation rel, Size keysz, ScanKey scankey,
 			Page page, ItemId itemid, StrategyNumber strat);
-extern OffsetNumber
+extern		OffsetNumber
 _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
  */
-extern StrategyNumber
+extern		StrategyNumber
 _bt_getstrat(Relation rel, AttrNumber attno,
 			 RegProcedure proc);
-extern bool
+extern		bool
 _bt_invokestrat(Relation rel, AttrNumber attno,
 				StrategyNumber strat, Datum left, Datum right);
 
 /*
  * prototypes for functions in nbtutils.c
  */
-extern ScanKey	_bt_mkscankey(Relation rel, IndexTuple itup);
-extern void		_bt_freeskey(ScanKey skey);
-extern void		_bt_freestack(BTStack stack);
-extern void		_bt_orderkeys(Relation relation, BTScanOpaque so);
-extern bool		_bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size * keysok);
-extern BTItem	_bt_formitem(IndexTuple itup);
+extern ScanKey _bt_mkscankey(Relation rel, IndexTuple itup);
+extern void _bt_freeskey(ScanKey skey);
+extern void _bt_freestack(BTStack stack);
+extern void _bt_orderkeys(Relation relation, BTScanOpaque so);
+extern bool _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size * keysok);
+extern BTItem _bt_formitem(IndexTuple itup);
 
 /*
  * prototypes for functions in nbtsort.c
  */
-extern void    *_bt_spoolinit(Relation index, int ntapes, bool isunique);
-extern void		_bt_spooldestroy(void *spool);
-extern void		_bt_spool(Relation index, BTItem btitem, void *spool);
-extern void		_bt_leafbuild(Relation index, void *spool);
+extern void *_bt_spoolinit(Relation index, int ntapes, bool isunique);
+extern void _bt_spooldestroy(void *spool);
+extern void _bt_spool(Relation index, BTItem btitem, void *spool);
+extern void _bt_leafbuild(Relation index, void *spool);
 
 #endif							/* NBTREE_H */
diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h
index 65994dbe7ef..a86a4596d66 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: printtup.h,v 1.3 1997/09/07 04:56:07 momjian Exp $
+ * $Id: printtup.h,v 1.4 1997/09/08 02:34:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,11 +16,11 @@
 #include <access/htup.h>
 #include <access/tupdesc.h>
 
-extern Oid		typtoout(Oid type);
-extern void		printtup(HeapTuple tuple, TupleDesc typeinfo);
-extern void		showatts(char *name, TupleDesc attinfo);
-extern void		debugtup(HeapTuple tuple, TupleDesc typeinfo);
-extern void		printtup_internal(HeapTuple tuple, TupleDesc typeinfo);
-extern Oid		gettypelem(Oid type);
+extern Oid	typtoout(Oid type);
+extern void printtup(HeapTuple tuple, TupleDesc typeinfo);
+extern void showatts(char *name, TupleDesc attinfo);
+extern void debugtup(HeapTuple tuple, TupleDesc typeinfo);
+extern void printtup_internal(HeapTuple tuple, TupleDesc typeinfo);
+extern Oid	gettypelem(Oid type);
 
 #endif							/* PRINTTUP_H */
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 356bcefc529..c4270c433ed 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relscan.h,v 1.6 1997/09/07 04:56:08 momjian Exp $
+ * $Id: relscan.h,v 1.7 1997/09/08 02:34:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,41 +21,41 @@ typedef ItemPointerData MarkData;
 
 typedef struct HeapScanDescData
 {
-	Relation		rs_rd;		/* pointer to relation descriptor */
-	HeapTuple		rs_ptup;	/* previous tuple in scan */
-	HeapTuple		rs_ctup;	/* current tuple in scan */
-	HeapTuple		rs_ntup;	/* next tuple in scan */
-	Buffer			rs_pbuf;	/* previous buffer in scan */
-	Buffer			rs_cbuf;	/* current buffer in scan */
-	Buffer			rs_nbuf;	/* next buffer in scan */
+	Relation	rs_rd;			/* pointer to relation descriptor */
+	HeapTuple	rs_ptup;		/* previous tuple in scan */
+	HeapTuple	rs_ctup;		/* current tuple in scan */
+	HeapTuple	rs_ntup;		/* next tuple in scan */
+	Buffer		rs_pbuf;		/* previous buffer in scan */
+	Buffer		rs_cbuf;		/* current buffer in scan */
+	Buffer		rs_nbuf;		/* next buffer in scan */
 	ItemPointerData rs_mptid;	/* marked previous tid */
 	ItemPointerData rs_mctid;	/* marked current tid */
 	ItemPointerData rs_mntid;	/* marked next tid */
 	ItemPointerData rs_mcd;		/* marked current delta XXX ??? */
-	bool			rs_atend;	/* restart scan at end? */
-	TimeQual		rs_tr;		/* time qualification */
-	uint16			rs_cdelta;	/* current delta in chain */
-	uint16			rs_nkeys;	/* number of attributes in keys */
-	ScanKey			rs_key;		/* key descriptors */
-}				HeapScanDescData;
+	bool		rs_atend;		/* restart scan at end? */
+	TimeQual	rs_tr;			/* time qualification */
+	uint16		rs_cdelta;		/* current delta in chain */
+	uint16		rs_nkeys;		/* number of attributes in keys */
+	ScanKey		rs_key;			/* key descriptors */
+}			HeapScanDescData;
 
 typedef HeapScanDescData *HeapScanDesc;
 
 typedef struct IndexScanDescData
 {
-	Relation		relation;	/* relation descriptor */
-	void		   *opaque;		/* am-specific slot */
+	Relation	relation;		/* relation descriptor */
+	void	   *opaque;			/* am-specific slot */
 	ItemPointerData previousItemData;	/* previous index pointer */
 	ItemPointerData currentItemData;	/* current index pointer */
 	ItemPointerData nextItemData;		/* next index pointer */
-	MarkData		previousMarkData;	/* marked previous pointer */
-	MarkData		currentMarkData;	/* marked current  pointer */
-	MarkData		nextMarkData;		/* marked next pointer */
-	uint8			flags;		/* scan position flags */
-	bool			scanFromEnd;/* restart scan at end? */
-	uint16			numberOfKeys;		/* number of key attributes */
-	ScanKey			keyData;	/* key descriptor */
-}				IndexScanDescData;
+	MarkData	previousMarkData;		/* marked previous pointer */
+	MarkData	currentMarkData;/* marked current  pointer */
+	MarkData	nextMarkData;	/* marked next pointer */
+	uint8		flags;			/* scan position flags */
+	bool		scanFromEnd;	/* restart scan at end? */
+	uint16		numberOfKeys;	/* number of key attributes */
+	ScanKey		keyData;		/* key descriptor */
+}			IndexScanDescData;
 
 typedef IndexScanDescData *IndexScanDesc;
 
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 98699eba37f..e8c05bdd299 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.7 1997/09/07 04:56:09 momjian Exp $
+ * $Id: rtree.h,v 1.8 1997/09/08 02:34:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,8 +42,8 @@
 
 typedef struct RTreePageOpaqueData
 {
-	uint32			flags;
-}				RTreePageOpaqueData;
+	uint32		flags;
+}			RTreePageOpaqueData;
 
 typedef RTreePageOpaqueData *RTreePageOpaque;
 
@@ -54,9 +54,9 @@ typedef RTreePageOpaqueData *RTreePageOpaque;
 typedef struct RTSTACK
 {
 	struct RTSTACK *rts_parent;
-	OffsetNumber	rts_child;
-	BlockNumber		rts_blk;
-}				RTSTACK;
+	OffsetNumber rts_child;
+	BlockNumber rts_blk;
+}			RTSTACK;
 
 /*
  *	When we're doing a scan, we need to keep track of the parent stack
@@ -72,10 +72,10 @@ typedef struct RTreeScanOpaqueData
 {
 	struct RTSTACK *s_stack;
 	struct RTSTACK *s_markstk;
-	uint16			s_flags;
-	uint16			s_internalNKey;
-	ScanKey			s_internalKey;
-}				RTreeScanOpaqueData;
+	uint16		s_flags;
+	uint16		s_internalNKey;
+	ScanKey		s_internalKey;
+}			RTreeScanOpaqueData;
 
 typedef RTreeScanOpaqueData *RTreeScanOpaque;
 
@@ -105,7 +105,7 @@ typedef RTreeScanOpaqueData *RTreeScanOpaque;
 #define RTOP_SPLIT		1
 
 /* defined in rtree.c */
-extern void		freestack(RTSTACK * s);
+extern void freestack(RTSTACK * s);
 
 /* rget.c */
 extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
@@ -114,25 +114,25 @@ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
  *		RTree code.
  *		Defined in access/index-rtree/
  */
-extern InsertIndexResult
+extern		InsertIndexResult
 rtinsert(Relation r, Datum * datum, char *nulls,
 		 ItemPointer ht_ctid, Relation heapRel);
-extern char    *rtdelete(Relation r, ItemPointer tid);
+extern char *rtdelete(Relation r, ItemPointer tid);
 
 extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
-extern IndexScanDesc
+extern		IndexScanDesc
 rtbeginscan(Relation r, bool fromEnd, uint16 nkeys,
 			ScanKey key);
 
-extern void		rtendscan(IndexScanDesc s);
-extern void		rtmarkpos(IndexScanDesc s);
-extern void		rtrestrpos(IndexScanDesc s);
-extern void		rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
+extern void rtendscan(IndexScanDesc s);
+extern void rtmarkpos(IndexScanDesc s);
+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,
 		Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
-extern void		_rtdump(Relation r);
+extern void _rtdump(Relation r);
 
 /* rtscan.c */
 extern void
@@ -140,7 +140,7 @@ rtadjscans(Relation r, int op, BlockNumber blkno,
 		   OffsetNumber offnum);
 
 /* rtstrat.h */
-extern RegProcedure
+extern		RegProcedure
 RTMapOperator(Relation r, AttrNumber attnum,
 			  RegProcedure proc);
 
diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h
index b91fc2fa066..edcd56f75c1 100644
--- a/src/include/access/rtscan.h
+++ b/src/include/access/rtscan.h
@@ -6,12 +6,12 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtscan.h,v 1.2 1997/09/07 04:56:10 momjian Exp $
+ * $Id: rtscan.h,v 1.3 1997/09/08 02:34:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTSCAN_H
 
-void			rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
+void		rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
 
 #endif							/* RTSCAN_H */
diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h
index 3f33f04e914..e03cc42acba 100644
--- a/src/include/access/rtstrat.h
+++ b/src/include/access/rtstrat.h
@@ -6,13 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtstrat.h,v 1.2 1997/09/07 04:56:11 momjian Exp $
+ * $Id: rtstrat.h,v 1.3 1997/09/08 02:34:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTSTRAT_H
 
-extern RegProcedure
+extern		RegProcedure
 RTMapOperator(Relation r, AttrNumber attnum,
 			  RegProcedure proc);
 
diff --git a/src/include/access/skey.h b/src/include/access/skey.h
index 44c43c88758..3de53f89964 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: skey.h,v 1.4 1997/09/07 04:56:13 momjian Exp $
+ * $Id: skey.h,v 1.5 1997/09/08 02:34:26 momjian Exp $
  *
  *
  * Note:
@@ -20,13 +20,13 @@
 
 typedef struct ScanKeyData
 {
-	bits16			sk_flags;	/* flags */
-	AttrNumber		sk_attno;	/* domain number */
-	RegProcedure	sk_procedure;		/* procedure OID */
-	func_ptr		sk_func;
-	int32			sk_nargs;
-	Datum			sk_argument;/* data to compare */
-}				ScanKeyData;
+	bits16		sk_flags;		/* flags */
+	AttrNumber	sk_attno;		/* domain number */
+	RegProcedure sk_procedure;	/* procedure OID */
+	func_ptr	sk_func;
+	int32		sk_nargs;
+	Datum		sk_argument;	/* data to compare */
+}			ScanKeyData;
 
 typedef ScanKeyData *ScanKey;
 
@@ -44,7 +44,7 @@ typedef ScanKeyData *ScanKey;
 /*
  * prototypes for functions in access/common/scankey.c
  */
-extern void		ScanKeyEntrySetIllegal(ScanKey entry);
+extern void ScanKeyEntrySetIllegal(ScanKey entry);
 extern void
 ScanKeyEntryInitialize(ScanKey entry, bits16 flags,
 	 AttrNumber attributeNumber, RegProcedure procedure, Datum argument);
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index 035582ef766..222a45f8f7b 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.5 1997/09/07 04:56:14 momjian Exp $
+ * $Id: strat.h,v 1.6 1997/09/08 02:34:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,50 +16,51 @@
 
 #include <access/skey.h>
 
-typedef uint16	StrategyNumber;
+typedef uint16 StrategyNumber;
 
 #define InvalidStrategy 0
 
 typedef struct StrategyTransformMapData
 {
-	StrategyNumber	strategy[1];/* VARIABLE LENGTH ARRAY */
-}				StrategyTransformMapData;		/* VARIABLE LENGTH
+	StrategyNumber strategy[1]; /* VARIABLE LENGTH ARRAY */
+}			StrategyTransformMapData;	/* VARIABLE LENGTH
 
-												 * STRUCTURE */
+										 *
+										 * STRUCTURE */
 
 typedef StrategyTransformMapData *StrategyTransformMap;
 
 typedef struct StrategyOperatorData
 {
-	StrategyNumber	strategy;
-	bits16			flags;		/* scan qualification flags h/skey.h */
-}				StrategyOperatorData;
+	StrategyNumber strategy;
+	bits16		flags;			/* scan qualification flags h/skey.h */
+}			StrategyOperatorData;
 
 typedef StrategyOperatorData *StrategyOperator;
 
 typedef struct StrategyTermData
 {								/* conjunctive term */
-	uint16			degree;
+	uint16		degree;
 	StrategyOperatorData operatorData[1];		/* VARIABLE LENGTH */
-}				StrategyTermData;		/* VARIABLE LENGTH STRUCTURE */
+}			StrategyTermData;	/* VARIABLE LENGTH STRUCTURE */
 
 typedef StrategyTermData *StrategyTerm;
 
 typedef struct StrategyExpressionData
 {								/* disjunctive normal form */
-	StrategyTerm	term[1];	/* VARIABLE LENGTH ARRAY */
-}				StrategyExpressionData; /* VARIABLE LENGTH STRUCTURE */
+	StrategyTerm term[1];		/* VARIABLE LENGTH ARRAY */
+}			StrategyExpressionData;		/* VARIABLE LENGTH STRUCTURE */
 
 typedef StrategyExpressionData *StrategyExpression;
 
 typedef struct StrategyEvaluationData
 {
-	StrategyNumber	maxStrategy;
+	StrategyNumber maxStrategy;
 	StrategyTransformMap negateTransform;
 	StrategyTransformMap commuteTransform;
 	StrategyTransformMap negateCommuteTransform;
 	StrategyExpression expression[12];	/* XXX VARIABLE LENGTH */
-}				StrategyEvaluationData; /* VARIABLE LENGTH STRUCTURE */
+}			StrategyEvaluationData;		/* VARIABLE LENGTH STRUCTURE */
 
 typedef StrategyEvaluationData *StrategyEvaluation;
 
@@ -78,15 +79,15 @@ typedef StrategyEvaluationData *StrategyEvaluation;
 
 typedef struct StrategyMapData
 {
-	ScanKeyData		entry[1];	/* VARIABLE LENGTH ARRAY */
-}				StrategyMapData;/* VARIABLE LENGTH STRUCTURE */
+	ScanKeyData entry[1];		/* VARIABLE LENGTH ARRAY */
+}			StrategyMapData;	/* VARIABLE LENGTH STRUCTURE */
 
 typedef StrategyMapData *StrategyMap;
 
 typedef struct IndexStrategyData
 {
 	StrategyMapData strategyMapData[1]; /* VARIABLE LENGTH ARRAY */
-}				IndexStrategyData;		/* VARIABLE LENGTH STRUCTURE */
+}			IndexStrategyData;	/* VARIABLE LENGTH STRUCTURE */
 
 typedef IndexStrategyData *IndexStrategy;
 
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 98a07aad102..7a898c4eb5d 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.8 1997/09/07 04:56:14 momjian Exp $
+ * $Id: transam.h,v 1.9 1997/09/08 02:34:27 momjian Exp $
  *
  *	 NOTES
  *		Transaction System Version 101 now support proper oid
@@ -85,8 +85,8 @@ typedef unsigned char XidStatus;/* (2 bits) */
  */
 typedef struct LogRelationContentsData
 {
-	int				TransSystemVersion;
-}				LogRelationContentsData;
+	int			TransSystemVersion;
+}			LogRelationContentsData;
 
 typedef LogRelationContentsData *LogRelationContents;
 
@@ -104,8 +104,8 @@ typedef LogRelationContentsData *LogRelationContents;
  */
 typedef struct TimeRelationContentsData
 {
-	int				TransSystemVersion;
-}				TimeRelationContentsData;
+	int			TransSystemVersion;
+}			TimeRelationContentsData;
 
 typedef TimeRelationContentsData *TimeRelationContents;
 
@@ -127,11 +127,11 @@ typedef TimeRelationContentsData *TimeRelationContents;
  */
 typedef struct VariableRelationContentsData
 {
-	int				TransSystemVersion;
-	TransactionId	nextXidData;
-	TransactionId	lastXidData;
-	Oid				nextOid;
-}				VariableRelationContentsData;
+	int			TransSystemVersion;
+	TransactionId nextXidData;
+	TransactionId lastXidData;
+	Oid			nextOid;
+}			VariableRelationContentsData;
 
 typedef VariableRelationContentsData *VariableRelationContents;
 
@@ -144,25 +144,25 @@ typedef VariableRelationContentsData *VariableRelationContents;
  * prototypes for functions in transam/transam.c
  */
 extern AbsoluteTime TransactionIdGetCommitTime(TransactionId transactionId);
-extern void		InitializeTransactionLog(void);
-extern bool		TransactionIdDidCommit(TransactionId transactionId);
-extern bool		TransactionIdDidAbort(TransactionId transactionId);
-extern void		TransactionIdCommit(TransactionId transactionId);
-extern void		TransactionIdAbort(TransactionId transactionId);
+extern void InitializeTransactionLog(void);
+extern bool TransactionIdDidCommit(TransactionId transactionId);
+extern bool TransactionIdDidAbort(TransactionId transactionId);
+extern void TransactionIdCommit(TransactionId transactionId);
+extern void TransactionIdAbort(TransactionId transactionId);
 
 /* in transam/transsup.c */
-extern void		AmiTransactionOverride(bool flag);
+extern void AmiTransactionOverride(bool flag);
 extern void
 TransComputeBlockNumber(Relation relation,
 			 TransactionId transactionId, BlockNumber * blockNumberOutP);
-extern XidStatus
+extern		XidStatus
 TransBlockNumberGetXidStatus(Relation relation,
 			   BlockNumber blockNumber, TransactionId xid, bool * failP);
 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
@@ -171,11 +171,11 @@ TransBlockNumberSetCommitTime(Relation relation,
 							  bool * failP);
 
 /* in transam/varsup.c */
-extern void		VariableRelationPutNextXid(TransactionId xid);
-extern void		GetNewTransactionId(TransactionId * xid);
-extern void		UpdateLastCommittedXid(TransactionId xid);
-extern void		GetNewObjectId(Oid * oid_return);
-extern void		CheckMaxObjectId(Oid assigned_oid);
+extern void VariableRelationPutNextXid(TransactionId xid);
+extern void GetNewTransactionId(TransactionId * xid);
+extern void UpdateLastCommittedXid(TransactionId xid);
+extern void GetNewObjectId(Oid * oid_return);
+extern void CheckMaxObjectId(Oid assigned_oid);
 
 /* ----------------
  *		global variable extern declarations
@@ -196,12 +196,12 @@ extern TransactionId NullTransactionId;
 extern TransactionId AmiTransactionId;
 extern TransactionId FirstTransactionId;
 
-extern int		RecoveryCheckingEnableState;
+extern int	RecoveryCheckingEnableState;
 
 /* in transsup.c */
-extern bool		AMI_OVERRIDE;
+extern bool AMI_OVERRIDE;
 
 /* in varsup.c */
-extern int		OidGenLockId;
+extern int	OidGenLockId;
 
 #endif							/* TRAMSAM_H */
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index 4196e6b955c..870098b2c0d 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.9 1997/09/07 04:56:16 momjian Exp $
+ * $Id: tupdesc.h,v 1.10 1997/09/08 02:34:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,27 +20,27 @@
 
 typedef struct attrDefault
 {
-	AttrNumber		adnum;
-	char		   *adbin;
-	char		   *adsrc;
-}				AttrDefault;
+	AttrNumber	adnum;
+	char	   *adbin;
+	char	   *adsrc;
+}			AttrDefault;
 
 typedef struct constrCheck
 {
-	char		   *ccname;
-	char		   *ccbin;
-	char		   *ccsrc;
-}				ConstrCheck;
+	char	   *ccname;
+	char	   *ccbin;
+	char	   *ccsrc;
+}			ConstrCheck;
 
 /* This structure contains constraints of a tuple */
 typedef struct tupleConstr
 {
-	AttrDefault    *defval;
-	ConstrCheck    *check;
-	uint16			num_defval;
-	uint16			num_check;
-	bool			has_not_null;
-}				TupleConstr;
+	AttrDefault *defval;
+	ConstrCheck *check;
+	uint16		num_defval;
+	uint16		num_check;
+	bool		has_not_null;
+}			TupleConstr;
 
 /*
  * This structure contains all information (i.e. from Classes
@@ -48,12 +48,12 @@ typedef struct tupleConstr
  */
 typedef struct tupleDesc
 {
-	int				natts;
+	int			natts;
 	/* Number of attributes in the tuple */
 	AttributeTupleForm *attrs;
 	/* attrs[N] is a pointer to the description of Attribute Number N+1.  */
-	TupleConstr    *constr;
-}			   *TupleDesc;
+	TupleConstr *constr;
+}		   *TupleDesc;
 
 extern TupleDesc CreateTemplateTupleDesc(int natts);
 
@@ -63,9 +63,9 @@ extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc);
 
 extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc);
 
-extern void		FreeTupleDesc(TupleDesc tupdesc);
+extern void FreeTupleDesc(TupleDesc tupdesc);
 
-extern bool
+extern		bool
 TupleDescInitEntry(TupleDesc desc,
 				   AttrNumber attributeNumber,
 				   char *attributeName,
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 7eb639230ab..58d1eb56429 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.5 1997/09/07 04:56:18 momjian Exp $
+ * $Id: valid.h,v 1.6 1997/09/08 02:34:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,16 +22,16 @@
  * ----------------
  */
 
-extern bool
+extern		bool
 heap_keytest(HeapTuple t, TupleDesc tupdesc,
 			 int nkeys, ScanKey keys);
 
-extern HeapTuple
+extern		HeapTuple
 heap_tuple_satisfies(ItemId itemId, Relation relation,
 					 Buffer buffer, PageHeader disk_page,
 					 TimeQual qual, int nKeys,
 					 ScanKey key);
 
-extern bool		TupleUpdatedByCurXactAndCmd(HeapTuple t);
+extern bool TupleUpdatedByCurXactAndCmd(HeapTuple t);
 
 #endif							/* VALID_H */
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index e8ed4123f06..69aea57ff11 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.7 1997/09/07 04:56:19 momjian Exp $
+ * $Id: xact.h,v 1.8 1997/09/08 02:34:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,13 +21,13 @@
  */
 typedef struct TransactionStateData
 {
-	TransactionId	transactionIdData;
-	CommandId		commandId;
-	CommandId		scanCommandId;
-	AbsoluteTime	startTime;
-	int				state;
-	int				blockState;
-}				TransactionStateData;
+	TransactionId transactionIdData;
+	CommandId	commandId;
+	CommandId	scanCommandId;
+	AbsoluteTime startTime;
+	int			state;
+	int			blockState;
+}			TransactionStateData;
 
 /* ----------------
  *		transaction states
@@ -57,44 +57,44 @@ typedef TransactionStateData *TransactionState;
  *		extern definitions
  * ----------------
  */
-extern int		TransactionFlushEnabled(void);
-extern void		SetTransactionFlushEnabled(bool state);
+extern int	TransactionFlushEnabled(void);
+extern void SetTransactionFlushEnabled(bool state);
 
-extern bool		IsTransactionState(void);
-extern bool		IsAbortedTransactionBlockState(void);
-extern void		OverrideTransactionSystem(bool flag);
+extern bool IsTransactionState(void);
+extern bool IsAbortedTransactionBlockState(void);
+extern void OverrideTransactionSystem(bool flag);
 extern TransactionId GetCurrentTransactionId(void);
 extern CommandId GetCurrentCommandId(void);
 extern CommandId GetScanCommandId(void);
-extern void		SetScanCommandId(CommandId);
+extern void SetScanCommandId(CommandId);
 extern AbsoluteTime GetCurrentTransactionStartTime(void);
-extern bool		TransactionIdIsCurrentTransactionId(TransactionId xid);
-extern bool		CommandIdIsCurrentCommandId(CommandId cid);
-extern bool		CommandIdGEScanCommandId(CommandId cid);
-extern void		CommandCounterIncrement(void);
-extern void		InitializeTransactionSystem(void);
-extern bool		CurrentXactInProgress(void);
-extern void		StartTransactionCommand(void);
-extern void		CommitTransactionCommand(void);
-extern void		AbortCurrentTransaction(void);
-extern void		BeginTransactionBlock(void);
-extern void		EndTransactionBlock(void);
-extern bool		IsTransactionBlock(void);
-extern void		UserAbortTransactionBlock(void);
+extern bool TransactionIdIsCurrentTransactionId(TransactionId xid);
+extern bool CommandIdIsCurrentCommandId(CommandId cid);
+extern bool CommandIdGEScanCommandId(CommandId cid);
+extern void CommandCounterIncrement(void);
+extern void InitializeTransactionSystem(void);
+extern bool CurrentXactInProgress(void);
+extern void StartTransactionCommand(void);
+extern void CommitTransactionCommand(void);
+extern void AbortCurrentTransaction(void);
+extern void BeginTransactionBlock(void);
+extern void EndTransactionBlock(void);
+extern bool IsTransactionBlock(void);
+extern void UserAbortTransactionBlock(void);
 
 extern TransactionId DisabledTransactionId;
 
 /* defined in xid.c */
 extern TransactionId xidin(char *representation);
-extern char    *xidout(TransactionId transactionId);
-extern bool		xideq(TransactionId xid1, TransactionId xid2);
-extern bool		TransactionIdIsValid(TransactionId transactionId);
-extern void		StoreInvalidTransactionId(TransactionId * destination);
+extern char *xidout(TransactionId transactionId);
+extern bool xideq(TransactionId xid1, TransactionId xid2);
+extern bool TransactionIdIsValid(TransactionId transactionId);
+extern void StoreInvalidTransactionId(TransactionId * destination);
 extern void
 TransactionIdStore(TransactionId transactionId,
 				   TransactionId * destination);
-extern bool		TransactionIdEquals(TransactionId id1, TransactionId id2);
-extern bool		TransactionIdIsLessThan(TransactionId id1, TransactionId id2);
-extern void		TransactionIdAdd(TransactionId * xid, int value);
+extern bool TransactionIdEquals(TransactionId id1, TransactionId id2);
+extern bool TransactionIdIsLessThan(TransactionId id1, TransactionId id2);
+extern void TransactionIdAdd(TransactionId * xid, int value);
 
 #endif							/* XACT_H */
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index 3adecdcdbd3..ccf54e892ae 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.6 1997/09/07 04:56:23 momjian Exp $
+ * $Id: bootstrap.h,v 1.7 1997/09/08 02:34:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,18 +21,18 @@
 
 typedef struct hashnode
 {
-	int				strnum;		/* Index into string table */
+	int			strnum;			/* Index into string table */
 	struct hashnode *next;
-}				hashnode;
+}			hashnode;
 
 #define EMITPROMPT printf("> ")
 
 extern Relation reldesc;
 extern AttributeTupleForm attrtypes[MAXATTR];
-extern int		numattr;
-extern int		DebugMode;
+extern int	numattr;
+extern int	DebugMode;
 
-extern int		BootstrapMain(int ac, char *av[]);
+extern int	BootstrapMain(int ac, char *av[]);
 extern void
 index_register(char *heap,
 			   char *ind,
@@ -43,18 +43,18 @@ index_register(char *heap,
 			   FuncIndexInfo * finfo,
 			   PredInfo * predInfo);
 
-extern void		err_out(void);
-extern void		InsertOneTuple(Oid objectid);
-extern void		closerel(char *name);
-extern void		boot_openrel(char *name);
-extern char    *LexIDStr(int ident_num);
-
-extern void		DefineAttr(char *name, char *type, int attnum);
-extern void		InsertOneValue(Oid objectid, char *value, int i);
-extern void		InsertOneNull(int i);
-extern char    *MapArrayTypeName(char *s);
-extern char    *CleanUpStr(char *s);
-extern int		EnterString(char *str);
-extern void		build_indices(void);
+extern void err_out(void);
+extern void InsertOneTuple(Oid objectid);
+extern void closerel(char *name);
+extern void boot_openrel(char *name);
+extern char *LexIDStr(int ident_num);
+
+extern void DefineAttr(char *name, char *type, int attnum);
+extern void InsertOneValue(Oid objectid, char *value, int i);
+extern void InsertOneNull(int i);
+extern char *MapArrayTypeName(char *s);
+extern char *CleanUpStr(char *s);
+extern int	EnterString(char *str);
+extern void build_indices(void);
 
 #endif							/* BOOTSTRAP_H */
diff --git a/src/include/c.h b/src/include/c.h
index cf9367c0fd1..bb5ec57db3c 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.17 1997/09/07 04:55:35 momjian Exp $
+ * $Id: c.h,v 1.18 1997/09/08 02:33:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,10 +61,10 @@
 #define false	((char) 0)
 #define true	((char) 1)
 #ifndef __cplusplus
-typedef char	bool;
+typedef char bool;
 
 #endif							/* not C++ */
-typedef bool   *BoolPtr;
+typedef bool *BoolPtr;
 
 #ifndef TRUE
 #define TRUE	1
@@ -94,7 +94,7 @@ typedef bool   *BoolPtr;
  *		XXX Pointer arithmetic is done with this, so it can't be void *
  *		under "true" ANSI compilers.
  */
-typedef char   *Pointer;
+typedef char *Pointer;
 
 #ifndef NULL
 /*
@@ -116,7 +116,7 @@ typedef char   *Pointer;
  * Pointer --
  *		Variable containing address of any memory resident object.
  */
-typedef char   *Pointer;
+typedef char *Pointer;
 
 #ifndef NULL
 /*
@@ -228,35 +228,35 @@ typedef unsigned int uint32;	/* >= 32 bits */
  *		Since sizeof(floatN) may be > sizeof(char *), always pass
  *		floatN by reference.
  */
-typedef float	float32data;
-typedef double	float64data;
-typedef float  *float32;
+typedef float float32data;
+typedef double float64data;
+typedef float *float32;
 typedef double *float64;
 
 /*
  * boolN --
  *		Boolean value, AT LEAST N BITS IN SIZE.
  */
-typedef uint8	bool8;			/* >= 8 bits */
-typedef uint16	bool16;			/* >= 16 bits */
-typedef uint32	bool32;			/* >= 32 bits */
+typedef uint8 bool8;			/* >= 8 bits */
+typedef uint16 bool16;			/* >= 16 bits */
+typedef uint32 bool32;			/* >= 32 bits */
 
 /*
  * bitsN --
  *		Unit of bitwise operation, AT LEAST N BITS IN SIZE.
  */
-typedef uint8	bits8;			/* >= 8 bits */
-typedef uint16	bits16;			/* >= 16 bits */
-typedef uint32	bits32;			/* >= 32 bits */
+typedef uint8 bits8;			/* >= 8 bits */
+typedef uint16 bits16;			/* >= 16 bits */
+typedef uint32 bits32;			/* >= 32 bits */
 
 /*
  * wordN --
  *		Unit of storage, AT LEAST N BITS IN SIZE,
  *		used to fetch/store data.
  */
-typedef uint8	word8;			/* >= 8 bits */
-typedef uint16	word16;			/* >= 16 bits */
-typedef uint32	word32;			/* >= 32 bits */
+typedef uint8 word8;			/* >= 8 bits */
+typedef uint16 word16;			/* >= 16 bits */
+typedef uint32 word32;			/* >= 32 bits */
 
 /*
  * Size --
@@ -276,8 +276,8 @@ typedef unsigned int Index;
 #define MAXDIM 6
 typedef struct
 {
-	int				indx[MAXDIM];
-}				IntArray;
+	int			indx[MAXDIM];
+}			IntArray;
 
 /*
  * Offset --
@@ -319,7 +319,7 @@ typedef signed int Offset;
  */
 
 typedef unsigned long Datum;	/* XXX sizeof(long) >= sizeof(void *) */
-typedef Datum  *DatumPtr;
+typedef Datum *DatumPtr;
 
 #define GET_1_BYTE(datum)	(((Datum) (datum)) & 0x000000ff)
 #define GET_2_BYTES(datum)	(((Datum) (datum)) & 0x0000ffff)
@@ -564,11 +564,11 @@ typedef Datum  *DatumPtr;
  * Exception Handling definitions
  */
 
-typedef char   *ExcMessage;
+typedef char *ExcMessage;
 typedef struct Exception
 {
-	ExcMessage		message;
-}				Exception;
+	ExcMessage	message;
+}			Exception;
 
 /*
  * NO_ASSERT_CHECKING, if defined, turns off all the assertions.
@@ -712,7 +712,7 @@ ExceptionalCondition(char *conditionName,
  *		form is used by assert and the exception handling stuff
  * ----------------
  */
-extern char    *form(const char *fmt,...);
+extern char *form(const char *fmt,...);
 
 
 
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index c888d8648de..e0b77b4779d 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catalog.h,v 1.3 1997/09/07 04:56:25 momjian Exp $
+ * $Id: catalog.h,v 1.4 1997/09/08 02:34:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,10 @@
 
 #include <access/tupdesc.h>
 
-extern char    *relpath(char relname[]);
-extern bool		IsSystemRelationName(char *relname);
-extern bool		IsSharedSystemRelationName(char *relname);
-extern Oid		newoid(void);
-extern void		fillatt(TupleDesc att);
+extern char *relpath(char relname[]);
+extern bool IsSystemRelationName(char *relname);
+extern bool IsSharedSystemRelationName(char *relname);
+extern Oid	newoid(void);
+extern void fillatt(TupleDesc att);
 
 #endif							/* CATALOG_H */
diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h
index 8dcf95b45ab..2130a472d07 100644
--- a/src/include/catalog/catname.h
+++ b/src/include/catalog/catname.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catname.h,v 1.5 1997/09/07 04:56:27 momjian Exp $
+ * $Id: catname.h,v 1.6 1997/09/08 02:34:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,6 +49,6 @@
 #define  RelCheckRelationName "pg_relcheck"
 #define  TriggerRelationName "pg_trigger"
 
-extern char    *SharedSystemRelationNames[];
+extern char *SharedSystemRelationNames[];
 
 #endif							/* CATNAME_H */
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index 616aa9e42ef..c16ec918dde 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heap.h,v 1.5 1997/09/07 04:56:29 momjian Exp $
+ * $Id: heap.h,v 1.6 1997/09/08 02:34:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,16 +17,16 @@
 
 extern Relation heap_creatr(char *relname, unsigned smgr, TupleDesc att);
 
-extern Oid
+extern		Oid
 heap_create(char relname[],
 			char *typename,
 			int arch,
 			unsigned smgr, TupleDesc tupdesc);
 
-extern void		heap_destroy(char relname[]);
-extern void		heap_destroyr(Relation r);
+extern void heap_destroy(char relname[]);
+extern void heap_destroyr(Relation r);
 
-extern void		InitTempRelList(void);
-extern void		DestroyTempRels(void);
+extern void InitTempRelList(void);
+extern void DestroyTempRels(void);
 
 #endif							/* HEAP_H */
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 5ce47e90168..d85e30535ec 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.6 1997/09/07 04:56:31 momjian Exp $
+ * $Id: index.h,v 1.7 1997/09/08 02:34:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,11 +18,11 @@
 #include <access/itup.h>
 #include <access/funcindex.h>
 
-extern			Form_pg_am
-				AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId);
+extern		Form_pg_am
+			AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId);
 
 extern void
-				UpdateIndexPredicate(Oid indexoid, Node * oldPred, Node * predicate);
+			UpdateIndexPredicate(Oid indexoid, Node * oldPred, Node * predicate);
 
 extern void
 InitIndexStrategy(int numatts,
@@ -44,7 +44,7 @@ index_create(char *heapRelationName,
 			 bool islossy,
 			 bool unique);
 
-extern void		index_destroy(Oid indexId);
+extern void index_destroy(Oid indexId);
 
 extern void
 FormIndexDatum(int numberOfAttributes,
@@ -52,7 +52,7 @@ FormIndexDatum(int numberOfAttributes,
 			   TupleDesc heapDescriptor, Buffer buffer, Datum * datum,
 			   char *nullv, FuncIndexInfoPtr fInfo);
 
-extern void		UpdateStats(Oid relid, long reltuples, bool hasindex);
+extern void UpdateStats(Oid relid, long reltuples, bool hasindex);
 
 extern void
 FillDummyExprContext(ExprContext * econtext, TupleTableSlot * slot,
@@ -64,7 +64,7 @@ index_build(Relation heapRelation, Relation indexRelation,
 	  uint16 parameterCount, Datum * parameter, FuncIndexInfo * funcInfo,
 			PredInfo * predInfo);
 
-extern bool		IndexIsUnique(Oid indexId);
-extern bool		IndexIsUniqueNoCache(Oid indexId);
+extern bool IndexIsUnique(Oid indexId);
+extern bool IndexIsUniqueNoCache(Oid indexId);
 
 #endif							/* INDEX_H */
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index c428aec8a22..664249ccbcb 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.5 1997/09/07 04:56:32 momjian Exp $
+ * $Id: indexing.h,v 1.6 1997/09/08 02:34:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,41 +46,41 @@
 #define RelCheckIndex	   "pg_relcheckind"
 #define TriggerRelidIndex  "pg_trigrelidind"
 
-extern char    *Name_pg_attr_indices[];
-extern char    *Name_pg_proc_indices[];
-extern char    *Name_pg_type_indices[];
-extern char    *Name_pg_class_indices[];
-extern char    *Name_pg_attrdef_indices[];
-extern char    *Name_pg_relcheck_indices[];
-extern char    *Name_pg_trigger_indices[];
+extern char *Name_pg_attr_indices[];
+extern char *Name_pg_proc_indices[];
+extern char *Name_pg_type_indices[];
+extern char *Name_pg_class_indices[];
+extern char *Name_pg_attrdef_indices[];
+extern char *Name_pg_relcheck_indices[];
+extern char *Name_pg_trigger_indices[];
 
-extern char    *IndexedCatalogNames[];
+extern char *IndexedCatalogNames[];
 
 /*
  * indexing.c prototypes
  *
  * Functions for each index to perform the necessary scan on a cache miss.
  */
-extern void		CatalogOpenIndices(int nIndices, char *names[], Relation idescs[]);
-extern void		CatalogCloseIndices(int nIndices, Relation * idescs);
+extern void CatalogOpenIndices(int nIndices, char *names[], Relation idescs[]);
+extern void CatalogCloseIndices(int nIndices, Relation * idescs);
 extern void
 CatalogIndexInsert(Relation * idescs,
 				   int nIndices,
 				   Relation heapRelation,
 				   HeapTuple heapTuple);
-extern bool		CatalogHasIndex(char *catName, Oid catId);
+extern bool CatalogHasIndex(char *catName, Oid catId);
 
-extern HeapTuple
+extern		HeapTuple
 AttributeNameIndexScan(Relation heapRelation,
 					   Oid relid,
 					   char *attname);
 
-extern HeapTuple
+extern		HeapTuple
 AttributeNumIndexScan(Relation heapRelation,
 					  Oid relid,
 					  AttrNumber attnum);
 extern HeapTuple ProcedureOidIndexScan(Relation heapRelation, Oid procId);
-extern HeapTuple
+extern		HeapTuple
 ProcedureNameIndexScan(Relation heapRelation,
 					   char *procName, int nargs, Oid * argTypes);
 extern HeapTuple ProcedureSrcIndexScan(Relation heapRelation, text * procSrc);
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 39f8c5d697a..60b8cc42302 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_aggregate.h,v 1.9 1997/09/07 04:56:36 momjian Exp $
+ * $Id: pg_aggregate.h,v 1.10 1997/09/08 02:34:54 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -44,17 +44,17 @@
  */
 CATALOG(pg_aggregate)
 {
-	NameData		aggname;
-	Oid				aggowner;
-	regproc			aggtransfn1;
-	regproc			aggtransfn2;
-	regproc			aggfinalfn;
-	Oid				aggbasetype;
-	Oid				aggtranstype1;
-	Oid				aggtranstype2;
-	Oid				aggfinaltype;
-	text			agginitval1;/* VARIABLE LENGTH FIELD */
-	text			agginitval2;/* VARIABLE LENGTH FIELD */
+	NameData	aggname;
+	Oid			aggowner;
+	regproc		aggtransfn1;
+	regproc		aggtransfn2;
+	regproc		aggfinalfn;
+	Oid			aggbasetype;
+	Oid			aggtranstype1;
+	Oid			aggtranstype2;
+	Oid			aggfinaltype;
+	text		agginitval1;	/* VARIABLE LENGTH FIELD */
+	text		agginitval2;	/* VARIABLE LENGTH FIELD */
 } FormData_pg_aggregate;
 
 /* ----------------
@@ -139,7 +139,7 @@ AggregateCreate(char *aggName,
 				char *aggtransfn2typeName,
 				char *agginitval1,
 				char *agginitval2);
-extern char    *
+extern char *
 AggNameGetInitVal(char *aggName, Oid basetype,
 				  int xfuncno, bool * isNull);
 
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index 361c102b502..7c83398fe1f 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_am.h,v 1.3 1997/09/07 04:56:37 momjian Exp $
+ * $Id: pg_am.h,v 1.4 1997/09/08 02:34:55 momjian Exp $
  *
  * NOTES
  *		the genbki.sh script reads this file and generates .bki
@@ -35,28 +35,28 @@
  */
 CATALOG(pg_am)
 {
-	NameData		amname;
-	Oid				amowner;
-	char			amkind;
-	int2			amstrategies;
-	int2			amsupport;
-	regproc			amgettuple;
-	regproc			aminsert;
-	regproc			amdelete;
-	regproc			amgetattr;
-	regproc			amsetlock;
-	regproc			amsettid;
-	regproc			amfreetuple;
-	regproc			ambeginscan;
-	regproc			amrescan;
-	regproc			amendscan;
-	regproc			ammarkpos;
-	regproc			amrestrpos;
-	regproc			amopen;
-	regproc			amclose;
-	regproc			ambuild;
-	regproc			amcreate;
-	regproc			amdestroy;
+	NameData	amname;
+	Oid			amowner;
+	char		amkind;
+	int2		amstrategies;
+	int2		amsupport;
+	regproc		amgettuple;
+	regproc		aminsert;
+	regproc		amdelete;
+	regproc		amgetattr;
+	regproc		amsetlock;
+	regproc		amsettid;
+	regproc		amfreetuple;
+	regproc		ambeginscan;
+	regproc		amrescan;
+	regproc		amendscan;
+	regproc		ammarkpos;
+	regproc		amrestrpos;
+	regproc		amopen;
+	regproc		amclose;
+	regproc		ambuild;
+	regproc		amcreate;
+	regproc		amdestroy;
 } FormData_pg_am;
 
 /* ----------------
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index 7e42e0f4f0f..b2cb9a26f86 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amop.h,v 1.6 1997/09/07 04:56:37 momjian Exp $
+ * $Id: pg_amop.h,v 1.7 1997/09/08 02:34:56 momjian Exp $
  *
  * NOTES
  *	 the genbki.sh script reads this file and generates .bki
@@ -32,12 +32,12 @@
  */
 CATALOG(pg_amop)
 {
-	Oid				amopid;
-	Oid				amopclaid;
-	Oid				amopopr;
-	int2			amopstrategy;
-	regproc			amopselect;
-	regproc			amopnpages;
+	Oid			amopid;
+	Oid			amopclaid;
+	Oid			amopopr;
+	int2		amopstrategy;
+	regproc		amopselect;
+	regproc		amopnpages;
 } FormData_pg_amop;
 
 /* ----------------
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index e9aca5c73e7..ea4069543b2 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amproc.h,v 1.5 1997/09/07 04:56:39 momjian Exp $
+ * $Id: pg_amproc.h,v 1.6 1997/09/08 02:34:57 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -34,10 +34,10 @@
  */
 CATALOG(pg_amproc)
 {
-	Oid				amid;
-	Oid				amopclaid;
-	Oid				amproc;
-	int2			amprocnum;
+	Oid			amid;
+	Oid			amopclaid;
+	Oid			amproc;
+	int2		amprocnum;
 } FormData_pg_amproc;
 
 /* ----------------
diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h
index 9fc546f05b2..6a3b6309d99 100644
--- a/src/include/catalog/pg_attrdef.h
+++ b/src/include/catalog/pg_attrdef.h
@@ -28,10 +28,10 @@
  */
 CATALOG(pg_attrdef) BOOTSTRAP
 {
-	Oid				adrelid;
-	int2			adnum;
-	text			adbin;
-	text			adsrc;
+	Oid			adrelid;
+	int2		adnum;
+	text		adbin;
+	text		adsrc;
 } FormData_pg_attrdef;
 
 /* ----------------
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index 5150463c324..1729aeb2cdb 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_attribute.h,v 1.15 1997/09/07 04:56:41 momjian Exp $
+ * $Id: pg_attribute.h,v 1.16 1997/09/08 02:35:02 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -40,9 +40,9 @@
  */
 CATALOG(pg_attribute) BOOTSTRAP
 {
-	Oid				attrelid;
-	NameData		attname;
-	Oid				atttypid;
+	Oid			attrelid;
+	NameData	attname;
+	Oid			atttypid;
 
 	/*
 	 * atttypid is the OID of the instance in Catalog Class pg_type that
@@ -51,15 +51,15 @@ CATALOG(pg_attribute) BOOTSTRAP
 	 * attalign attributes of this instance, so they had better match or
 	 * Postgres will fail.
 	 */
-	float4			attdisbursion;
-	int2			attlen;
+	float4		attdisbursion;
+	int2		attlen;
 
 	/*
 	 * attlen is a copy of the typlen field from pg_type for this
 	 * attribute.  See atttypid above.	See struct TypeTupleFormData for
 	 * definition.
 	 */
-	int2			attnum;
+	int2		attnum;
 
 	/*
 	 * attnum is the "attribute number" for the attribute:	A value that
@@ -74,8 +74,8 @@ CATALOG(pg_attribute) BOOTSTRAP
 	 *
 	 * Note that (attnum - 1) is often used as the index to an array.
 	 */
-	int4			attnelems;
-	int4			attcacheoff;
+	int4		attnelems;
+	int4		attcacheoff;
 
 	/*
 	 * fastgetattr() uses attcacheoff to cache byte offsets of attributes
@@ -84,25 +84,25 @@ CATALOG(pg_attribute) BOOTSTRAP
 	 * tuple descriptor, we may then update attcacheoff in the copies.
 	 * This speeds up the attribute walking process.
 	 */
-	bool			attbyval;
+	bool		attbyval;
 
 	/*
 	 * attbyval is a copy of the typbyval field from pg_type for this
 	 * attribute.  See atttypid above.	See struct TypeTupleFormData for
 	 * definition.
 	 */
-	bool			attisset;
-	char			attalign;
+	bool		attisset;
+	char		attalign;
 
 	/*
 	 * attalign is a copy of the typalign field from pg_type for this
 	 * attribute.  See atttypid above.	See struct TypeTupleFormData for
 	 * definition.
 	 */
-	bool			attnotnull;
+	bool		attnotnull;
 
 	/* This flag represents the "NOT NULL" constraint */
-	bool			atthasdef;
+	bool		atthasdef;
 
 	/* Has DEFAULT value or not */
 } FormData_pg_attribute;
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index 2be1ebd90b5..83751152897 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_class.h,v 1.10 1997/09/07 04:56:42 momjian Exp $
+ * $Id: pg_class.h,v 1.11 1997/09/08 02:35:03 momjian Exp $
  *
  * NOTES
  *	  ``pg_relation'' is being replaced by ``pg_class''.  currently
@@ -52,33 +52,33 @@
  */
 CATALOG(pg_class) BOOTSTRAP
 {
-	NameData		relname;
-	Oid				reltype;
-	Oid				relowner;
-	Oid				relam;
-	int4			relpages;
-	int4			reltuples;
-	int4			relexpires; /* really used as a abstime, but fudge it
+	NameData	relname;
+	Oid			reltype;
+	Oid			relowner;
+	Oid			relam;
+	int4		relpages;
+	int4		reltuples;
+	int4		relexpires;		/* really used as a abstime, but fudge it
 								 * for now */
-	int4			relpreserved;		/* really used as a reltime, but
-										 * fudge it for now */
-	bool			relhasindex;
-	bool			relisshared;
-	char			relkind;
-	char			relarch;	/* 'h' = heavy, 'l' = light, 'n' = no
+	int4		relpreserved;	/* really used as a reltime, but fudge it
+								 * for now */
+	bool		relhasindex;
+	bool		relisshared;
+	char		relkind;
+	char		relarch;		/* 'h' = heavy, 'l' = light, 'n' = no
 								 * archival */
-	int2			relnatts;
+	int2		relnatts;
 
 	/*
 	 * relnatts is the number of user attributes this class has.  There
 	 * must be exactly this many instances in Class pg_attribute for this
 	 * class which have attnum > 0 (= user attribute).
 	 */
-	int2			relsmgr;
-	int2			relchecks;	/* # of CHECK constraints */
-	int2			reltriggers;/* # of TRIGGERs */
-	bool			relhasrules;
-	aclitem			relacl[1];	/* this is here for the catalog */
+	int2		relsmgr;
+	int2		relchecks;		/* # of CHECK constraints */
+	int2		reltriggers;	/* # of TRIGGERs */
+	bool		relhasrules;
+	aclitem		relacl[1];		/* this is here for the catalog */
 } FormData_pg_class;
 
 #define CLASS_TUPLE_SIZE \
diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h
index bd77e23a5df..10015c7cc69 100644
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_database.h,v 1.4 1997/09/07 04:56:43 momjian Exp $
+ * $Id: pg_database.h,v 1.5 1997/09/08 02:35:04 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,9 +32,9 @@
  */
 CATALOG(pg_database) BOOTSTRAP
 {
-	NameData		datname;
-	int4			datdba;
-	text			datpath;	/* VARIABLE LENGTH FIELD */
+	NameData	datname;
+	int4		datdba;
+	text		datpath;		/* VARIABLE LENGTH FIELD */
 } FormData_pg_database;
 
 /* ----------------
diff --git a/src/include/catalog/pg_defaults.h b/src/include/catalog/pg_defaults.h
index a35c06c4db8..4aaa234b8e3 100644
--- a/src/include/catalog/pg_defaults.h
+++ b/src/include/catalog/pg_defaults.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_defaults.h,v 1.3 1997/09/07 04:56:44 momjian Exp $
+ * $Id: pg_defaults.h,v 1.4 1997/09/08 02:35:05 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,8 +32,8 @@
  */
 CATALOG(pg_defaults) BOOTSTRAP
 {
-	NameData		defname;
-	NameData		defvalue;
+	NameData	defname;
+	NameData	defvalue;
 } FormData_pg_defaults;
 
 /* ----------------
diff --git a/src/include/catalog/pg_demon.h b/src/include/catalog/pg_demon.h
index 0bdb0151aa1..86bb1628d3e 100644
--- a/src/include/catalog/pg_demon.h
+++ b/src/include/catalog/pg_demon.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_demon.h,v 1.3 1997/09/07 04:56:45 momjian Exp $
+ * $Id: pg_demon.h,v 1.4 1997/09/08 02:35:06 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,10 +32,10 @@
  */
 CATALOG(pg_demon) BOOTSTRAP
 {
-	Oid				demserid;
-	NameData		demname;
-	Oid				demowner;
-	regproc			demcode;
+	Oid			demserid;
+	NameData	demname;
+	Oid			demowner;
+	regproc		demcode;
 } FormData_pg_demon;
 
 /* ----------------
diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h
index 3661b5149fe..5680c0fe1b6 100644
--- a/src/include/catalog/pg_group.h
+++ b/src/include/catalog/pg_group.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_group.h,v 1.3 1997/09/07 04:56:46 momjian Exp $
+ * $Id: pg_group.h,v 1.4 1997/09/08 02:35:07 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -26,9 +26,9 @@
 
 CATALOG(pg_group) BOOTSTRAP
 {
-	NameData		groname;
-	int4			grosysid;
-	int4			grolist[1];
+	NameData	groname;
+	int4		grosysid;
+	int4		grolist[1];
 } FormData_pg_group;
 
 /* VARIABLE LENGTH STRUCTURE */
diff --git a/src/include/catalog/pg_hosts.h b/src/include/catalog/pg_hosts.h
index 633b28579b6..a31b9d736af 100644
--- a/src/include/catalog/pg_hosts.h
+++ b/src/include/catalog/pg_hosts.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_hosts.h,v 1.3 1997/09/07 04:56:46 momjian Exp $
+ * $Id: pg_hosts.h,v 1.4 1997/09/08 02:35:09 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -30,9 +30,9 @@
 
 CATALOG(pg_hosts) BOOTSTRAP
 {
-	NameData		dbName;
-	text			address;
-	text			mask;
+	NameData	dbName;
+	text		address;
+	text		mask;
 } FormData_pg_hosts;
 
 typedef FormData_pg_hosts *Form_pg_hosts;
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index 0ebaea1c76a..a466d4dfd0c 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_index.h,v 1.4 1997/09/07 04:56:47 momjian Exp $
+ * $Id: pg_index.h,v 1.5 1997/09/08 02:35:12 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -41,20 +41,19 @@
  */
 CATALOG(pg_index)
 {
-	Oid				indexrelid;
-	Oid				indrelid;
-	Oid				indproc;	/* registered procedure for functional
+	Oid			indexrelid;
+	Oid			indrelid;
+	Oid			indproc;		/* registered procedure for functional
 								 * index */
-	int28			indkey;
-	oid8			indclass;
-	bool			indisclustered;
-	bool			indisarchived;
-	bool			indislossy; /* do we fetch false tuples (lossy
+	int28		indkey;
+	oid8		indclass;
+	bool		indisclustered;
+	bool		indisarchived;
+	bool		indislossy;		/* do we fetch false tuples (lossy
 								 * compression)? */
-	bool			indhaskeytype;		/* does key type != attribute
-										 * type? */
-	bool			indisunique;/* is this a unique index? */
-	text			indpred;	/* query plan for partial index predicate */
+	bool		indhaskeytype;	/* does key type != attribute type? */
+	bool		indisunique;	/* is this a unique index? */
+	text		indpred;		/* query plan for partial index predicate */
 } FormData_pg_index;
 
 #define INDEX_MAX_KEYS 8		/* maximum number of keys in an index
diff --git a/src/include/catalog/pg_inheritproc.h b/src/include/catalog/pg_inheritproc.h
index f53561a51ca..60bad51b939 100644
--- a/src/include/catalog/pg_inheritproc.h
+++ b/src/include/catalog/pg_inheritproc.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_inheritproc.h,v 1.3 1997/09/07 04:56:50 momjian Exp $
+ * $Id: pg_inheritproc.h,v 1.4 1997/09/08 02:35:13 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,10 +32,10 @@
  */
 CATALOG(pg_inheritproc)
 {
-	NameData		inhproname;
-	Oid				inhargrel;
-	Oid				inhdefrel;
-	Oid				inhproc;
+	NameData	inhproname;
+	Oid			inhargrel;
+	Oid			inhdefrel;
+	Oid			inhproc;
 } FormData_pg_inheritproc;
 
 /* ----------------
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index 8913b613ed0..7cb1584f5c6 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_inherits.h,v 1.3 1997/09/07 04:56:51 momjian Exp $
+ * $Id: pg_inherits.h,v 1.4 1997/09/08 02:35:14 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,9 +32,9 @@
  */
 CATALOG(pg_inherits)
 {
-	Oid				inhrel;
-	Oid				inhparent;
-	int4			inhseqno;
+	Oid			inhrel;
+	Oid			inhparent;
+	int4		inhseqno;
 } FormData_pg_inherits;
 
 /* ----------------
diff --git a/src/include/catalog/pg_ipl.h b/src/include/catalog/pg_ipl.h
index 4e735f8dc33..ea3eb34512a 100644
--- a/src/include/catalog/pg_ipl.h
+++ b/src/include/catalog/pg_ipl.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_ipl.h,v 1.3 1997/09/07 04:56:52 momjian Exp $
+ * $Id: pg_ipl.h,v 1.4 1997/09/08 02:35:15 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,9 +32,9 @@
  */
 CATALOG(pg_ipl)
 {
-	Oid				iplrel;
-	Oid				iplipl;
-	int4			iplseqno;
+	Oid			iplrel;
+	Oid			iplipl;
+	int4		iplseqno;
 } FormData_pg_ipl;
 
 /* ----------------
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index 1a1ac577aad..8c8490b4861 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_language.h,v 1.3 1997/09/07 04:56:53 momjian Exp $
+ * $Id: pg_language.h,v 1.4 1997/09/08 02:35:16 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,8 +32,8 @@
  */
 CATALOG(pg_language)
 {
-	NameData		lanname;
-	text			lancompiler;/* VARIABLE LENGTH FIELD */
+	NameData	lanname;
+	text		lancompiler;	/* VARIABLE LENGTH FIELD */
 } FormData_pg_language;
 
 /* ----------------
diff --git a/src/include/catalog/pg_listener.h b/src/include/catalog/pg_listener.h
index c1826a317a4..d80bf9df299 100644
--- a/src/include/catalog/pg_listener.h
+++ b/src/include/catalog/pg_listener.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_listener.h,v 1.3 1997/09/07 04:56:54 momjian Exp $
+ * $Id: pg_listener.h,v 1.4 1997/09/08 02:35:17 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -33,9 +33,9 @@
 
 CATALOG(pg_listener)
 {
-	NameData		relname;
-	int4			listenerpid;
-	int4			notification;
+	NameData	relname;
+	int4		listenerpid;
+	int4		notification;
 } FormData_pg_listener;
 
 /* ----------------
diff --git a/src/include/catalog/pg_log.h b/src/include/catalog/pg_log.h
index 977b1f9cccf..0cf9dc130bc 100644
--- a/src/include/catalog/pg_log.h
+++ b/src/include/catalog/pg_log.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_log.h,v 1.3 1997/09/07 04:56:55 momjian Exp $
+ * $Id: pg_log.h,v 1.4 1997/09/08 02:35:18 momjian Exp $
  *
  * NOTES
  *	  The structures and macros used by the transam/ code
@@ -29,7 +29,7 @@
 
 CATALOG(pg_log) BOOTSTRAP
 {
-	Oid				logfoo;
+	Oid			logfoo;
 } FormData_pg_log;
 
 typedef FormData_pg_log *Form_pg_log;
diff --git a/src/include/catalog/pg_magic.h b/src/include/catalog/pg_magic.h
index 7c92c2e3c55..c979f815dcc 100644
--- a/src/include/catalog/pg_magic.h
+++ b/src/include/catalog/pg_magic.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_magic.h,v 1.3 1997/09/07 04:56:57 momjian Exp $
+ * $Id: pg_magic.h,v 1.4 1997/09/08 02:35:18 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,8 +32,8 @@
  */
 CATALOG(pg_magic) BOOTSTRAP
 {
-	NameData		magname;
-	NameData		magvalue;
+	NameData	magname;
+	NameData	magvalue;
 } FormData_pg_magic;
 
 /* ----------------
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index f047de2c890..0d3b9abb8a4 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_opclass.h,v 1.4 1997/09/07 04:56:58 momjian Exp $
+ * $Id: pg_opclass.h,v 1.5 1997/09/08 02:35:19 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -33,8 +33,8 @@
 
 CATALOG(pg_opclass)
 {
-	NameData		opcname;
-	Oid				opcdeftype;
+	NameData	opcname;
+	Oid			opcdeftype;
 } FormData_pg_opclass;
 
 /* ----------------
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 111974e4722..fdc90746328 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_operator.h,v 1.14 1997/09/07 04:57:00 momjian Exp $
+ * $Id: pg_operator.h,v 1.15 1997/09/08 02:35:20 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -35,22 +35,22 @@
  */
 CATALOG(pg_operator)
 {
-	NameData		oprname;
-	Oid				oprowner;
-	int2			oprprec;
-	char			oprkind;
-	bool			oprisleft;
-	bool			oprcanhash;
-	Oid				oprleft;
-	Oid				oprright;
-	Oid				oprresult;
-	Oid				oprcom;
-	Oid				oprnegate;
-	Oid				oprlsortop;
-	Oid				oprrsortop;
-	regproc			oprcode;
-	regproc			oprrest;
-	regproc			oprjoin;
+	NameData	oprname;
+	Oid			oprowner;
+	int2		oprprec;
+	char		oprkind;
+	bool		oprisleft;
+	bool		oprcanhash;
+	Oid			oprleft;
+	Oid			oprright;
+	Oid			oprresult;
+	Oid			oprcom;
+	Oid			oprnegate;
+	Oid			oprlsortop;
+	Oid			oprrsortop;
+	regproc		oprcode;
+	regproc		oprrest;
+	regproc		oprjoin;
 } FormData_pg_operator;
 
 /* ----------------
diff --git a/src/include/catalog/pg_parg.h b/src/include/catalog/pg_parg.h
index f5423f70862..28404998565 100644
--- a/src/include/catalog/pg_parg.h
+++ b/src/include/catalog/pg_parg.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_parg.h,v 1.4 1997/09/07 04:57:01 momjian Exp $
+ * $Id: pg_parg.h,v 1.5 1997/09/08 02:35:21 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -33,10 +33,10 @@
  */
 CATALOG(pg_parg)
 {
-	Oid				parproid;
-	int2			parnum;
-	char			parbound;
-	Oid				partype;
+	Oid			parproid;
+	int2		parnum;
+	char		parbound;
+	Oid			partype;
 } FormData_pg_parg;
 
 /* ----------------
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 2c9dfc9710e..2d08131cf22 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.28 1997/09/07 04:57:03 momjian Exp $
+ * $Id: pg_proc.h,v 1.29 1997/09/08 02:35:23 momjian Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -38,22 +38,22 @@
  */
 CATALOG(pg_proc) BOOTSTRAP
 {
-	NameData		proname;
-	Oid				proowner;
-	Oid				prolang;
-	bool			proisinh;
-	bool			proistrusted;
-	bool			proiscachable;
-	int2			pronargs;
-	bool			proretset;
-	Oid				prorettype;
-	oid8			proargtypes;
-	int4			probyte_pct;
-	int4			properbyte_cpu;
-	int4			propercall_cpu;
-	int4			prooutin_ratio;
-	text			prosrc;		/* VARIABLE LENGTH FIELD */
-	bytea			probin;		/* VARIABLE LENGTH FIELD */
+	NameData	proname;
+	Oid			proowner;
+	Oid			prolang;
+	bool		proisinh;
+	bool		proistrusted;
+	bool		proiscachable;
+	int2		pronargs;
+	bool		proretset;
+	Oid			prorettype;
+	oid8		proargtypes;
+	int4		probyte_pct;
+	int4		properbyte_cpu;
+	int4		propercall_cpu;
+	int4		prooutin_ratio;
+	text		prosrc;			/* VARIABLE LENGTH FIELD */
+	bytea		probin;			/* VARIABLE LENGTH FIELD */
 } FormData_pg_proc;
 
 /* ----------------
@@ -1103,7 +1103,7 @@ DATA(insert OID =  1319 (  currval	   PGUID 11 f t f 1 f 23 "25" 100 0 0 100  fo
 /*
  * prototypes for functions pg_proc.c
  */
-extern Oid
+extern		Oid
 ProcedureCreate(char *procedureName,
 				bool returnsSet,
 				char *returnTypeName,
diff --git a/src/include/catalog/pg_relcheck.h b/src/include/catalog/pg_relcheck.h
index c0ca6604756..2b80bd94243 100644
--- a/src/include/catalog/pg_relcheck.h
+++ b/src/include/catalog/pg_relcheck.h
@@ -28,10 +28,10 @@
  */
 CATALOG(pg_relcheck) BOOTSTRAP
 {
-	Oid				rcrelid;
-	NameData		rcname;
-	text			rcbin;
-	text			rcsrc;
+	Oid			rcrelid;
+	NameData	rcname;
+	text		rcbin;
+	text		rcsrc;
 } FormData_pg_relcheck;
 
 /* ----------------
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 8491d238954..3cf2afde97a 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_rewrite.h,v 1.3 1997/09/07 04:57:08 momjian Exp $
+ * $Id: pg_rewrite.h,v 1.4 1997/09/08 02:35:25 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,13 +32,13 @@
  */
 CATALOG(pg_rewrite)
 {
-	NameData		rulename;
-	char			ev_type;
-	Oid				ev_class;
-	int2			ev_attr;
-	bool			is_instead;
-	text			ev_qual;	/* VARLENA */
-	text			action;		/* VARLENA */
+	NameData	rulename;
+	char		ev_type;
+	Oid			ev_class;
+	int2		ev_attr;
+	bool		is_instead;
+	text		ev_qual;		/* VARLENA */
+	text		action;			/* VARLENA */
 } FormData_pg_rewrite;
 
 /* ----------------
diff --git a/src/include/catalog/pg_server.h b/src/include/catalog/pg_server.h
index 8c0c642dc13..dc74805645a 100644
--- a/src/include/catalog/pg_server.h
+++ b/src/include/catalog/pg_server.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_server.h,v 1.3 1997/09/07 04:57:09 momjian Exp $
+ * $Id: pg_server.h,v 1.4 1997/09/08 02:35:26 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,9 +32,9 @@
  */
 CATALOG(pg_server) BOOTSTRAP
 {
-	NameData		sername;
-	int2			serpid;
-	int2			serport;
+	NameData	sername;
+	int2		serpid;
+	int2		serport;
 } FormData_pg_server;
 
 /* ----------------
diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h
index 6059bbd477c..7b0919b1e1d 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_statistic.h,v 1.3 1997/09/07 04:57:10 momjian Exp $
+ * $Id: pg_statistic.h,v 1.4 1997/09/08 02:35:27 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,11 +32,11 @@
  */
 CATALOG(pg_statistic)
 {
-	Oid				starelid;
-	int2			staattnum;
-	Oid				staop;
-	text			stalokey;	/* VARIABLE LENGTH FIELD */
-	text			stahikey;	/* VARIABLE LENGTH FIELD */
+	Oid			starelid;
+	int2		staattnum;
+	Oid			staop;
+	text		stalokey;		/* VARIABLE LENGTH FIELD */
+	text		stahikey;		/* VARIABLE LENGTH FIELD */
 } FormData_pg_statistic;
 
 /* ----------------
diff --git a/src/include/catalog/pg_time.h b/src/include/catalog/pg_time.h
index f1955930f06..57675110372 100644
--- a/src/include/catalog/pg_time.h
+++ b/src/include/catalog/pg_time.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_time.h,v 1.3 1997/09/07 04:57:10 momjian Exp $
+ * $Id: pg_time.h,v 1.4 1997/09/08 02:35:28 momjian Exp $
  *
  * NOTES
  *	  The structures and macros used by the transam/ code
@@ -29,7 +29,7 @@
 
 CATALOG(pg_time) BOOTSTRAP
 {
-	Oid				timefoo;
+	Oid			timefoo;
 } FormData_pg_time;
 
 typedef FormData_pg_time *Form_pg_time;
diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h
index 08472839ef0..83fcbef656b 100644
--- a/src/include/catalog/pg_trigger.h
+++ b/src/include/catalog/pg_trigger.h
@@ -28,14 +28,14 @@
  */
 CATALOG(pg_trigger) BOOTSTRAP
 {
-	Oid				tgrelid;	/* triggered relation */
-	NameData		tgname;		/* trigger' name */
-	Oid				tgfoid;		/* OID of function to be called */
-	int2			tgtype;		/* BEFORE/AFTER UPDATE/DELETE/INSERT
+	Oid			tgrelid;		/* triggered relation */
+	NameData	tgname;			/* trigger' name */
+	Oid			tgfoid;			/* OID of function to be called */
+	int2		tgtype;			/* BEFORE/AFTER UPDATE/DELETE/INSERT
 								 * ROW/STATEMENT */
-	int2			tgnargs;	/* # of extra arguments in tgargs */
-	int28			tgattr;		/* UPDATE of attr1, attr2 ... (NI) */
-	bytea			tgargs;		/* first\000second\000tgnargs\000 */
+	int2		tgnargs;		/* # of extra arguments in tgargs */
+	int28		tgattr;			/* UPDATE of attr1, attr2 ... (NI) */
+	bytea		tgargs;			/* first\000second\000tgnargs\000 */
 } FormData_pg_trigger;
 
 /* ----------------
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 9083dad4452..650c1955fdc 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.17 1997/09/07 04:57:12 momjian Exp $
+ * $Id: pg_type.h,v 1.18 1997/09/08 02:35:32 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -39,17 +39,17 @@
  */
 CATALOG(pg_type) BOOTSTRAP
 {
-	NameData		typname;
-	Oid				typowner;
-	int2			typlen;
+	NameData	typname;
+	Oid			typowner;
+	int2		typlen;
 
 	/*
 	 * typlen is the number of bytes we use to represent a value of this
 	 * type, e.g. 4 for an int4.  But for a variable length type, typlen
 	 * is -1.
 	 */
-	int2			typprtlen;
-	bool			typbyval;
+	int2		typprtlen;
+	bool		typbyval;
 
 	/*
 	 * typbyval determines whether internal Postgres routines pass a value
@@ -70,11 +70,11 @@ CATALOG(pg_type) BOOTSTRAP
 	 * with the declared length, and typbyval is used somewhere. - tgl
 	 * 97/03/20)
 	 */
-	char			typtype;
-	bool			typisdefined;
-	char			typdelim;
-	Oid				typrelid;
-	Oid				typelem;
+	char		typtype;
+	bool		typisdefined;
+	char		typdelim;
+	Oid			typrelid;
+	Oid			typelem;
 
 	/*
 	 * typelem is NULL if this is not an array type.  If this is an array
@@ -84,11 +84,11 @@ CATALOG(pg_type) BOOTSTRAP
 	 * (Note that zero ("0") rather than _null_ is used in the declarations.
 	 * - tgl 97/03/20)
 	 */
-	regproc			typinput;
-	regproc			typoutput;
-	regproc			typreceive;
-	regproc			typsend;
-	char			typalign;
+	regproc		typinput;
+	regproc		typoutput;
+	regproc		typreceive;
+	regproc		typsend;
+	char		typalign;
 
 	/*
 	 * typalign is the alignment required when storing a value of this
@@ -105,7 +105,7 @@ CATALOG(pg_type) BOOTSTRAP
 	 * (This might actually be flexible depending on machine architecture,
 	 * but I doubt it - BRYANH 96.08).
 	 */
-	text			typdefault; /* VARIABLE LENGTH FIELD */
+	text		typdefault;		/* VARIABLE LENGTH FIELD */
 } TypeTupleFormData;
 
 /* ----------------
@@ -326,9 +326,9 @@ DATA(insert OID = 1296 ( timestamp	 PGUID	4  19 t b t \054 0	0 timestamp_in time
 /*
  * prototypes for functions in pg_type.c
  */
-extern Oid		TypeGet(char *typeName, bool * defined);
-extern Oid		TypeShellMake(char *typeName);
-extern Oid
+extern Oid	TypeGet(char *typeName, bool * defined);
+extern Oid	TypeShellMake(char *typeName);
+extern		Oid
 TypeCreate(char *typeName,
 		   Oid relationOid,
 		   int16 internalSize,
@@ -342,8 +342,8 @@ TypeCreate(char *typeName,
 		   char *elementTypeName,
 		   char *defaultTypeValue,
 		   bool passedByValue, char alignment);
-extern void		TypeRename(char *oldTypeName, char *newTypeName);
-extern char    *makeArrayTypeName(char *typeName);
+extern void TypeRename(char *oldTypeName, char *newTypeName);
+extern char *makeArrayTypeName(char *typeName);
 
 
 #endif							/* PG_TYPE_H */
diff --git a/src/include/catalog/pg_user.h b/src/include/catalog/pg_user.h
index 904e35cd15d..7f7bd8b6525 100644
--- a/src/include/catalog/pg_user.h
+++ b/src/include/catalog/pg_user.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_user.h,v 1.4 1997/09/07 04:57:13 momjian Exp $
+ * $Id: pg_user.h,v 1.5 1997/09/08 02:35:34 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -21,7 +21,7 @@
 
 /* Prototype required for superuser() from superuser.c */
 
-bool			superuser(void);
+bool		superuser(void);
 
 /* ----------------
  *		pg_user definition.  cpp turns this into
@@ -30,12 +30,12 @@ bool			superuser(void);
  */
 CATALOG(pg_user) BOOTSTRAP
 {
-	NameData		usename;
-	int4			usesysid;
-	bool			usecreatedb;
-	bool			usetrace;
-	bool			usesuper;
-	bool			usecatupd;
+	NameData	usename;
+	int4		usesysid;
+	bool		usecreatedb;
+	bool		usetrace;
+	bool		usesuper;
+	bool		usecatupd;
 } FormData_pg_user;
 
 /* ----------------
diff --git a/src/include/catalog/pg_variable.h b/src/include/catalog/pg_variable.h
index ef685f35719..95063125c8a 100644
--- a/src/include/catalog/pg_variable.h
+++ b/src/include/catalog/pg_variable.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_variable.h,v 1.3 1997/09/07 04:57:15 momjian Exp $
+ * $Id: pg_variable.h,v 1.4 1997/09/08 02:35:34 momjian Exp $
  *
  * NOTES
  *	  The structures and macros used by the transam/ code
@@ -29,7 +29,7 @@
 
 CATALOG(pg_variable) BOOTSTRAP
 {
-	Oid				varfoo;
+	Oid			varfoo;
 } FormData_pg_variable;
 
 typedef FormData_pg_variable *Form_pg_variable;
diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h
index ba1249ab04e..96b0c2125f1 100644
--- a/src/include/catalog/pg_version.h
+++ b/src/include/catalog/pg_version.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_version.h,v 1.4 1997/09/07 04:57:17 momjian Exp $
+ * $Id: pg_version.h,v 1.5 1997/09/08 02:35:35 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -32,9 +32,9 @@
  */
 CATALOG(pg_version)
 {
-	Oid				verrelid;
-	Oid				verbaseid;
-	int4			vertime;	/* really should be some abstime */
+	Oid			verrelid;
+	Oid			verbaseid;
+	int4		vertime;		/* really should be some abstime */
 } FormData_pg_version;
 
 /* ----------------
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index 4f63c7fde71..498cec4fbfd 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: async.h,v 1.6 1997/09/07 04:57:19 momjian Exp $
+ * $Id: async.h,v 1.7 1997/09/08 02:35:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,11 +15,11 @@
 
 #include <nodes/memnodes.h>
 
-extern void		Async_NotifyHandler(SIGNAL_ARGS);
-extern void		Async_Notify(char *relname);
-extern void		Async_NotifyAtCommit(void);
-extern void		Async_NotifyAtAbort(void);
-extern void		Async_Listen(char *relname, int pid);
+extern void Async_NotifyHandler(SIGNAL_ARGS);
+extern void Async_Notify(char *relname);
+extern void Async_NotifyAtCommit(void);
+extern void Async_NotifyAtAbort(void);
+extern void Async_Listen(char *relname, int pid);
 
 extern GlobalMemory notifyContext;
 
diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h
index 7f305c60144..5847d6b3c95 100644
--- a/src/include/commands/cluster.h
+++ b/src/include/commands/cluster.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994-5, Regents of the University of California
  *
- * $Id: cluster.h,v 1.3 1997/09/07 04:57:21 momjian Exp $
+ * $Id: cluster.h,v 1.4 1997/09/08 02:35:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,6 @@
 /*
  * functions
  */
-extern void		cluster(char oldrelname[], char oldindexname[]);
+extern void cluster(char oldrelname[], char oldindexname[]);
 
 #endif							/* CLUSTER_H */
diff --git a/src/include/commands/command.h b/src/include/commands/command.h
index 78c4aa5ea0e..57b2ff6c783 100644
--- a/src/include/commands/command.h
+++ b/src/include/commands/command.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: command.h,v 1.5 1997/09/07 04:57:22 momjian Exp $
+ * $Id: command.h,v 1.6 1997/09/08 02:35:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,9 +34,9 @@ PerformPortalFetch(char *name, bool forward, int count,
  * PerformPortalClose --
  *		Performs the POSTQUEL function CLOSE.
  */
-extern void		PerformPortalClose(char *name, CommandDest dest);
+extern void PerformPortalClose(char *name, CommandDest dest);
 
-extern void		PortalCleanup(Portal portal);
+extern void PortalCleanup(Portal portal);
 
 /*
  * PerformAddAttribute --
diff --git a/src/include/commands/creatinh.h b/src/include/commands/creatinh.h
index 52926dbe9f8..11364a48627 100644
--- a/src/include/commands/creatinh.h
+++ b/src/include/commands/creatinh.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: creatinh.h,v 1.2 1997/09/07 04:57:24 momjian Exp $
+ * $Id: creatinh.h,v 1.3 1997/09/08 02:35:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef CREATINH_H
 #define CREATINH_H
 
-extern void		DefineRelation(CreateStmt * stmt);
-extern void		RemoveRelation(char *name);
-extern char    *MakeArchiveName(Oid relid);
+extern void DefineRelation(CreateStmt * stmt);
+extern void RemoveRelation(char *name);
+extern char *MakeArchiveName(Oid relid);
 
 #endif							/* CREATINH_H */
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 8d916477380..88003629d1d 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: defrem.h,v 1.8 1997/09/07 04:57:25 momjian Exp $
+ * $Id: defrem.h,v 1.9 1997/09/08 02:35:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,25 +32,25 @@ extern void
 ExtendIndex(char *indexRelationName,
 			Expr * predicate,
 			List * rangetable);
-extern void		RemoveIndex(char *name);
+extern void RemoveIndex(char *name);
 
 /*
  * prototypes in define.c
  */
-extern void		CreateFunction(ProcedureStmt * stmt, CommandDest dest);
-extern void		DefineOperator(char *name, List * parameters);
-extern void		DefineAggregate(char *name, List * parameters);
-extern void		DefineType(char *name, List * parameters);
-extern void		CreateFunction(ProcedureStmt * stmt, CommandDest dest);
+extern void CreateFunction(ProcedureStmt * stmt, CommandDest dest);
+extern void DefineOperator(char *name, List * parameters);
+extern void DefineAggregate(char *name, List * parameters);
+extern void DefineType(char *name, List * parameters);
+extern void CreateFunction(ProcedureStmt * stmt, CommandDest dest);
 
 /*
  * prototypes in remove.c
  */
-extern void		RemoveFunction(char *functionName, int nargs, List * argNameList);
+extern void RemoveFunction(char *functionName, int nargs, List * argNameList);
 extern void
 RemoveOperator(char *operatorName,
 			   char *typeName1, char *typeName2);
-extern void		RemoveType(char *typeName);
-extern void		RemoveAggregate(char *aggName, char *aggType);
+extern void RemoveType(char *typeName);
+extern void RemoveAggregate(char *aggName, char *aggType);
 
 #endif							/* DEFREM_H */
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index f41f4dfa885..42aa7fd8d95 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -5,13 +5,13 @@
  *
  * Copyright (c) 1994-5, Regents of the University of California
  *
- * $Id: explain.h,v 1.3 1997/09/07 04:57:26 momjian Exp $
+ * $Id: explain.h,v 1.4 1997/09/08 02:35:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXPLAIN_H
 #define EXPLAIN_H
 
-extern void		ExplainQuery(Query * query, bool verbose, CommandDest dest);
+extern void ExplainQuery(Query * query, bool verbose, CommandDest dest);
 
 #endif							/* EXPLAIN_H */
diff --git a/src/include/commands/purge.h b/src/include/commands/purge.h
index 7c4d276afdb..de3f9c62a41 100644
--- a/src/include/commands/purge.h
+++ b/src/include/commands/purge.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: purge.h,v 1.2 1997/09/07 04:57:26 momjian Exp $
+ * $Id: purge.h,v 1.3 1997/09/08 02:35:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PURGE_H
 #define PURGE_H
 
-extern int32
+extern		int32
 RelationPurge(char *relationName,
 			  char *absoluteTimeString,
 			  char *relativeTimeString);
diff --git a/src/include/commands/recipe.h b/src/include/commands/recipe.h
index 82a3e01cae0..5e0d5286eb9 100644
--- a/src/include/commands/recipe.h
+++ b/src/include/commands/recipe.h
@@ -5,13 +5,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: recipe.h,v 1.2 1997/09/07 04:57:28 momjian Exp $
+ * $Id: recipe.h,v 1.3 1997/09/08 02:35:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RECIPE_H
 #define RECIPE_H
 
-extern void		beginRecipe(RecipeStmt * stmt);
+extern void beginRecipe(RecipeStmt * stmt);
 
 #endif							/* RECIPE_H */
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index 88497253b32..54f0ecd6c27 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -25,9 +25,9 @@
 #define SEQ_COL_FIRSTCOL		SEQ_COL_NAME
 #define SEQ_COL_LASTCOL			SEQ_COL_CALLED
 
-extern void		DefineSequence(CreateSeqStmt * stmt);
-extern int4		nextval(struct varlena * seqname);
-extern int4		currval(struct varlena * seqname);
-extern void		CloseSequences(void);
+extern void DefineSequence(CreateSeqStmt * stmt);
+extern int4 nextval(struct varlena * seqname);
+extern int4 currval(struct varlena * seqname);
+extern void CloseSequences(void);
 
 #endif							/* SEQUENCE_H */
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index 0f125a0de6a..6ba0394fdf7 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -13,16 +13,16 @@
 #include "access/htup.h"
 #include "utils/rel.h"
 
-typedef uint32	TriggerEvent;
+typedef uint32 TriggerEvent;
 
 typedef struct TriggerData
 {
-	TriggerEvent	tg_event;
-	Relation		tg_relation;
-	HeapTuple		tg_trigtuple;
-	HeapTuple		tg_newtuple;
-	Trigger		   *tg_trigger;
-}				TriggerData;
+	TriggerEvent tg_event;
+	Relation	tg_relation;
+	HeapTuple	tg_trigtuple;
+	HeapTuple	tg_newtuple;
+	Trigger    *tg_trigger;
+}			TriggerData;
 
 extern TriggerData *CurrentTriggerData;
 
@@ -58,15 +58,15 @@ extern TriggerData *CurrentTriggerData;
 		(!TRIGGER_FIRED_BEFORE (event))
 
 
-extern void		CreateTrigger(CreateTrigStmt * stmt);
-extern void		DropTrigger(DropTrigStmt * stmt);
-extern void		RelationRemoveTriggers(Relation rel);
+extern void CreateTrigger(CreateTrigStmt * stmt);
+extern void DropTrigger(DropTrigStmt * stmt);
+extern void RelationRemoveTriggers(Relation rel);
 
 extern HeapTuple ExecBRInsertTriggers(Relation rel, HeapTuple tuple);
-extern void		ExecARInsertTriggers(Relation rel, HeapTuple tuple);
-extern bool		ExecBRDeleteTriggers(Relation rel, ItemPointer tupleid);
-extern void		ExecARDeleteTriggers(Relation rel, ItemPointer tupleid);
+extern void ExecARInsertTriggers(Relation rel, HeapTuple tuple);
+extern bool ExecBRDeleteTriggers(Relation rel, ItemPointer tupleid);
+extern void ExecARDeleteTriggers(Relation rel, ItemPointer tupleid);
 extern HeapTuple ExecBRUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple tuple);
-extern void		ExecARUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple tuple);
+extern void ExecARUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple tuple);
 
 #endif							/* TRIGGER_H */
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index 59863f2d574..d2a4565688a 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: vacuum.h,v 1.8 1997/09/07 04:57:33 momjian Exp $
+ * $Id: vacuum.h,v 1.9 1997/09/08 02:36:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,92 +18,92 @@
 
 typedef struct VAttListData
 {
-	int				val_dummy;
+	int			val_dummy;
 	struct VAttListData *val_next;
-}				VAttListData;
+}			VAttListData;
 
 typedef VAttListData *VAttList;
 
 typedef struct VPageDescrData
 {
-	BlockNumber		vpd_blkno;	/* BlockNumber of this Page */
-	Size			vpd_free;	/* FreeSpace on this Page */
-	uint16			vpd_nusd;	/* Number of OffNums used by vacuum */
-	uint16			vpd_noff;	/* Number of OffNums free or to be free */
-	OffsetNumber	vpd_voff[1];/* Array of its OffNums */
-}				VPageDescrData;
+	BlockNumber vpd_blkno;		/* BlockNumber of this Page */
+	Size		vpd_free;		/* FreeSpace on this Page */
+	uint16		vpd_nusd;		/* Number of OffNums used by vacuum */
+	uint16		vpd_noff;		/* Number of OffNums free or to be free */
+	OffsetNumber vpd_voff[1];	/* Array of its OffNums */
+}			VPageDescrData;
 
 typedef VPageDescrData *VPageDescr;
 
 typedef struct VPageListData
 {
-	int				vpl_nemend; /* Number of "empty" end-pages */
-	int				vpl_npages; /* Number of pages in vpl_pgdesc */
-	VPageDescr	   *vpl_pgdesc; /* Descriptions of pages */
-}				VPageListData;
+	int			vpl_nemend;		/* Number of "empty" end-pages */
+	int			vpl_npages;		/* Number of pages in vpl_pgdesc */
+	VPageDescr *vpl_pgdesc;		/* Descriptions of pages */
+}			VPageListData;
 
 typedef VPageListData *VPageList;
 
 typedef struct
 {
-	FuncIndexInfo	finfo;
-	FuncIndexInfo  *finfoP;
-	IndexTupleForm	tform;
-	int				natts;
-}				IndDesc;
+	FuncIndexInfo finfo;
+	FuncIndexInfo *finfoP;
+	IndexTupleForm tform;
+	int			natts;
+}			IndDesc;
 
 typedef struct
 {
 	AttributeTupleForm attr;
-	Datum			best,
-					guess1,
-					guess2,
-					max,
-					min;
-	int16			best_len,
-					guess1_len,
-					guess2_len,
-					max_len,
-					min_len;
-	int32			best_cnt,
-					guess1_cnt,
-					guess1_hits,
-					guess2_hits,
-					null_cnt,
-					nonnull_cnt;
-	int32			max_cnt,
-					min_cnt;
-	func_ptr		f_cmpeq,
-					f_cmplt,
-					f_cmpgt;
-	regproc			outfunc;
-	bool			initialized;
-}				VacAttrStats;
+	Datum		best,
+				guess1,
+				guess2,
+				max,
+				min;
+	int16		best_len,
+				guess1_len,
+				guess2_len,
+				max_len,
+				min_len;
+	int32		best_cnt,
+				guess1_cnt,
+				guess1_hits,
+				guess2_hits,
+				null_cnt,
+				nonnull_cnt;
+	int32		max_cnt,
+				min_cnt;
+	func_ptr	f_cmpeq,
+				f_cmplt,
+				f_cmpgt;
+	regproc		outfunc;
+	bool		initialized;
+}			VacAttrStats;
 
 typedef struct VRelListData
 {
-	Oid				vrl_relid;
+	Oid			vrl_relid;
 	struct VRelListData *vrl_next;
-}				VRelListData;
+}			VRelListData;
 
 typedef VRelListData *VRelList;
 
 typedef struct VRelStats
 {
-	Oid				relid;
-	int				ntups;
-	int				npages;
-	Size			min_tlen;
-	Size			max_tlen;
-	bool			hasindex;
-	int				va_natts;	/* number of attrs being analyzed */
-	VacAttrStats   *vacattrstats;
-}				VRelStats;
-
-extern bool		VacuumRunning;
-
-extern void		vc_abort(void);
-extern void		vacuum(char *vacrel, bool verbose, bool analyze, List * va_spec);
+	Oid			relid;
+	int			ntups;
+	int			npages;
+	Size		min_tlen;
+	Size		max_tlen;
+	bool		hasindex;
+	int			va_natts;		/* number of attrs being analyzed */
+	VacAttrStats *vacattrstats;
+}			VRelStats;
+
+extern bool VacuumRunning;
+
+extern void vc_abort(void);
+extern void vacuum(char *vacrel, bool verbose, bool analyze, List * va_spec);
 
 #define ATTNVALS_SCALE	1000000000		/* XXX so it can act as a float4 */
 
diff --git a/src/include/commands/view.h b/src/include/commands/view.h
index 2e46fb6f4df..f4190c1f0be 100644
--- a/src/include/commands/view.h
+++ b/src/include/commands/view.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: view.h,v 1.2 1997/09/07 04:57:40 momjian Exp $
+ * $Id: view.h,v 1.3 1997/09/08 02:36:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VIEW_H
 #define VIEW_H
 
-extern char    *MakeRetrieveViewRuleName(char *view_name);
-extern void		DefineView(char *view_name, Query * view_parse);
-extern void		RemoveView(char *view_name);
+extern char *MakeRetrieveViewRuleName(char *view_name);
+extern void DefineView(char *view_name, Query * view_parse);
+extern void RemoveView(char *view_name);
 
 #endif							/* VIEW_H */
diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h
index d51864edf0e..3682f6319b5 100644
--- a/src/include/executor/execFlatten.h
+++ b/src/include/executor/execFlatten.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execFlatten.h,v 1.3 1997/09/07 04:57:41 momjian Exp $
+ * $Id: execFlatten.h,v 1.4 1997/09/08 02:36:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECFLATTEN_H
 #define EXECFLATTEN_H
 
-extern Datum	ExecEvalIter(Iter * iterNode, ExprContext * econtext, bool * resultIsNull, bool * iterIsDone);
+extern Datum ExecEvalIter(Iter * iterNode, ExprContext * econtext, bool * resultIsNull, bool * iterIsDone);
 
-extern void		ExecEvalFjoin(TargetEntry * tlist, ExprContext * econtext, bool * isNullVect, bool * fj_isDone);
+extern void ExecEvalFjoin(TargetEntry * tlist, ExprContext * econtext, bool * isNullVect, bool * fj_isDone);
 
 
 #endif							/* EXECFLATTEN_H */
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 61d298403b3..4337b3d1b4c 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdebug.h,v 1.3 1997/09/07 04:57:44 momjian Exp $
+ * $Id: execdebug.h,v 1.4 1997/09/08 02:36:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -176,13 +176,13 @@
  * ----------------
  */
 #ifdef EXEC_TUPLECOUNT
-extern int		NTupleProcessed;
-extern int		NTupleRetrieved;
-extern int		NTupleReplaced;
-extern int		NTupleAppended;
-extern int		NTupleDeleted;
-extern int		NIndexTupleProcessed;
-extern int		NIndexTupleInserted;
+extern int	NTupleProcessed;
+extern int	NTupleRetrieved;
+extern int	NTupleReplaced;
+extern int	NTupleAppended;
+extern int	NTupleDeleted;
+extern int	NIndexTupleProcessed;
+extern int	NIndexTupleInserted;
 
 #define IncrRetrieved()			NTupleRetrieved++
 #define IncrAppended()			NTupleAppended++
@@ -377,7 +377,7 @@ extern int		NIndexTupleInserted;
  */
 #undef NOTYET
 
-extern long		NDirectFileRead;
-extern long		NDirectFileWrite;
+extern long NDirectFileRead;
+extern long NDirectFileWrite;
 
 #endif							/* ExecDebugIncluded */
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 7f24b7630f0..f97e196f4fe 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdesc.h,v 1.4 1997/09/07 04:57:47 momjian Exp $
+ * $Id: execdesc.h,v 1.5 1997/09/08 02:36:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,11 +26,11 @@
  */
 typedef struct QueryDesc
 {
-	CmdType			operation;	/* CMD_SELECT, CMD_UPDATE, etc. */
-	Query		   *parsetree;
-	Plan		   *plantree;
-	CommandDest		dest;		/* the destination output of the execution */
-}				QueryDesc;
+	CmdType		operation;		/* CMD_SELECT, CMD_UPDATE, etc. */
+	Query	   *parsetree;
+	Plan	   *plantree;
+	CommandDest dest;			/* the destination output of the execution */
+}			QueryDesc;
 
 /* in pquery.c */
 extern QueryDesc *
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index c96f7439b6c..efa8dc3f01d 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.11 1997/09/07 04:57:47 momjian Exp $
+ * $Id: executor.h,v 1.12 1997/09/08 02:36:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,20 +30,20 @@ extern void
 ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
 			  ScanDirection dir, TimeQual timeRange,
 			  Relation * returnRelation, Pointer * returnScanDesc);
-extern void		ExecCloseR(Plan * node);
-extern void		ExecReScan(Plan * node, ExprContext * exprCtxt, Plan * parent);
-extern HeapScanDesc
+extern void ExecCloseR(Plan * node);
+extern void ExecReScan(Plan * node, ExprContext * exprCtxt, Plan * parent);
+extern		HeapScanDesc
 ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
 			ScanDirection direction, int nkeys, ScanKey skeys);
-extern void		ExecMarkPos(Plan * node);
-extern void		ExecRestrPos(Plan * node);
+extern void ExecMarkPos(Plan * node);
+extern void ExecRestrPos(Plan * node);
 extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid);
 
 /*
  * prototypes from functions in execJunk.c
  */
 extern JunkFilter *ExecInitJunkFilter(List * targetList);
-extern bool
+extern		bool
 ExecGetJunkAttribute(JunkFilter * junkfilter, TupleTableSlot * slot,
 					 char *attrName, Datum * value, bool * isNull);
 extern HeapTuple ExecRemoveJunk(JunkFilter * junkfilter, TupleTableSlot * slot);
@@ -54,39 +54,39 @@ extern HeapTuple ExecRemoveJunk(JunkFilter * junkfilter, TupleTableSlot * slot);
  */
 extern TupleDesc ExecutorStart(QueryDesc * queryDesc, EState * estate);
 extern TupleTableSlot *ExecutorRun(QueryDesc * queryDesc, EState * estate, int feature, int count);
-extern void		ExecutorEnd(QueryDesc * queryDesc, EState * estate);
+extern void ExecutorEnd(QueryDesc * queryDesc, EState * estate);
 extern HeapTuple ExecConstraints(char *caller, Relation rel, HeapTuple tuple);
 
 /*
  * prototypes from functions in execProcnode.c
  */
-extern bool		ExecInitNode(Plan * node, EState * estate, Plan * parent);
+extern bool ExecInitNode(Plan * node, EState * estate, Plan * parent);
 extern TupleTableSlot *ExecProcNode(Plan * node, Plan * parent);
-extern int		ExecCountSlotsNode(Plan * node);
-extern void		ExecEndNode(Plan * node, Plan * parent);
+extern int	ExecCountSlotsNode(Plan * node);
+extern void ExecEndNode(Plan * node, Plan * parent);
 
 /*
  * prototypes from functions in execQual.c
  */
-extern bool		execConstByVal;
-extern int		execConstLen;
+extern bool execConstByVal;
+extern int	execConstLen;
 
-extern Datum
+extern		Datum
 ExecExtractResult(TupleTableSlot * slot, AttrNumber attnum,
 				  bool * isNull);
-extern Datum
+extern		Datum
 ExecEvalParam(Param * expression, ExprContext * econtext,
 			  bool * isNull);
 
 /* stop here */
-extern char    *
+extern char *
 GetAttributeByName(TupleTableSlot * slot, char *attname,
 				   bool * isNull);
-extern Datum
+extern		Datum
 ExecEvalExpr(Node * expression, ExprContext * econtext, bool * isNull,
 			 bool * isDone);
-extern bool		ExecQual(List * qual, ExprContext * econtext);
-extern int		ExecTargetListLength(List * targetlist);
+extern bool ExecQual(List * qual, ExprContext * econtext);
+extern int	ExecTargetListLength(List * targetlist);
 extern TupleTableSlot *ExecProject(ProjectionInfo * projInfo, bool * isDone);
 
 /*
@@ -98,7 +98,7 @@ extern TupleTableSlot *ExecScan(Scan * node, TupleTableSlot * (*accessMtd) ());
  * prototypes from functions in execTuples.c
  */
 extern TupleTable ExecCreateTupleTable(int initialSize);
-extern void		ExecDestroyTupleTable(TupleTable table, bool shouldFree);
+extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree);
 extern TupleTableSlot *ExecAllocTableSlot(TupleTable table);
 extern TupleTableSlot *
 ExecStoreTuple(HeapTuple tuple,
@@ -106,19 +106,19 @@ ExecStoreTuple(HeapTuple tuple,
 			   Buffer buffer,
 			   bool shouldFree);
 extern TupleTableSlot *ExecClearTuple(TupleTableSlot * slot);
-extern bool		ExecSetSlotPolicy(TupleTableSlot * slot, bool shouldFree);
-extern TupleDesc
+extern bool ExecSetSlotPolicy(TupleTableSlot * slot, bool shouldFree);
+extern		TupleDesc
 ExecSetSlotDescriptor(TupleTableSlot * slot,
 					  TupleDesc tupdesc);
-extern void		ExecSetSlotDescriptorIsNew(TupleTableSlot * slot, bool isNew);
-extern void		ExecIncrSlotBufferRefcnt(TupleTableSlot * slot);
-extern bool		TupIsNull(TupleTableSlot * slot);
-extern void		ExecInitResultTupleSlot(EState * estate, CommonState * commonstate);
+extern void ExecSetSlotDescriptorIsNew(TupleTableSlot * slot, bool isNew);
+extern void ExecIncrSlotBufferRefcnt(TupleTableSlot * slot);
+extern bool TupIsNull(TupleTableSlot * slot);
+extern void ExecInitResultTupleSlot(EState * estate, CommonState * commonstate);
 extern void
 ExecInitScanTupleSlot(EState * estate,
 					  CommonScanState * commonscanstate);
-extern void		ExecInitMarkedTupleSlot(EState * estate, MergeJoinState * mergestate);
-extern void		ExecInitOuterTupleSlot(EState * estate, HashJoinState * hashstate);
+extern void ExecInitMarkedTupleSlot(EState * estate, MergeJoinState * mergestate);
+extern void ExecInitOuterTupleSlot(EState * estate, HashJoinState * hashstate);
 
 extern TupleDesc ExecGetTupType(Plan * node);
 extern TupleDesc ExecTypeFromTL(List * targetList);
@@ -126,21 +126,21 @@ extern TupleDesc ExecTypeFromTL(List * targetList);
 /*
  * prototypes from functions in execTuples.c
  */
-extern void		ResetTupleCount(void);
+extern void ResetTupleCount(void);
 extern void
 ExecAssignNodeBaseInfo(EState * estate, CommonState * basenode,
 					   Plan * parent);
-extern void		ExecAssignExprContext(EState * estate, CommonState * commonstate);
+extern void ExecAssignExprContext(EState * estate, CommonState * commonstate);
 extern void
 ExecAssignResultType(CommonState * commonstate,
 					 TupleDesc tupDesc);
 extern void
 ExecAssignResultTypeFromOuterPlan(Plan * node,
 								  CommonState * commonstate);
-extern void		ExecAssignResultTypeFromTL(Plan * node, CommonState * commonstate);
+extern void ExecAssignResultTypeFromTL(Plan * node, CommonState * commonstate);
 extern TupleDesc ExecGetResultType(CommonState * commonstate);
-extern void		ExecAssignProjectionInfo(Plan * node, CommonState * commonstate);
-extern void		ExecFreeProjectionInfo(CommonState * commonstate);
+extern void ExecAssignProjectionInfo(Plan * node, CommonState * commonstate);
+extern void ExecFreeProjectionInfo(CommonState * commonstate);
 extern TupleDesc ExecGetScanType(CommonScanState * csstate);
 extern void
 ExecAssignScanType(CommonScanState * csstate,
@@ -153,11 +153,11 @@ extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc);
 extern void
 ExecOpenIndices(Oid resultRelationOid,
 				RelationInfo * resultRelationInfo);
-extern void		ExecCloseIndices(RelationInfo * resultRelationInfo);
+extern void ExecCloseIndices(RelationInfo * resultRelationInfo);
 extern void
 ExecInsertIndexTuples(TupleTableSlot * slot, ItemPointer tupleid,
 					  EState * estate, bool is_update);
-extern void		resetVarAttrLenForCreateTable(TupleDesc tupType);
+extern void resetVarAttrLenForCreateTable(TupleDesc tupType);
 extern void
 setVarAttrLenForCreateTable(TupleDesc tupType,
 							List * targetList, List * rangeTable);
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 475f9309b8c..72b399663ca 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -6,18 +6,18 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: functions.h,v 1.2 1997/09/07 04:57:48 momjian Exp $
+ * $Id: functions.h,v 1.3 1997/09/08 02:36:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FUNCTIONS_H
 #define FUNCTIONS_H
 
-extern Datum
+extern		Datum
 ProjectAttribute(TupleDesc TD, TargetEntry * tlist,
 				 HeapTuple tup, bool * isnullP);
 
-extern Datum
+extern		Datum
 postquel_function(Func * funcNode, char **args,
 				  bool * isNull, bool * isDone);
 
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index e705c5c77d6..6950bb25bde 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hashjoin.h,v 1.4 1997/09/07 04:57:49 momjian Exp $
+ * $Id: hashjoin.h,v 1.5 1997/09/08 02:36:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
  *	because the hashtable may reallocate in difference processes
  * -----------------
  */
-typedef int		RelativeAddr;
+typedef int RelativeAddr;
 
 /* ------------------
  *	the relative addresses are always relative to the head of the
@@ -30,8 +30,8 @@ typedef int		RelativeAddr;
 #define ABSADDR(X)		((X) < 0 ? NULL: (char*)hashtable + X)
 #define RELADDR(X)		(RelativeAddr)((char*)(X) - (char*)hashtable)
 
-typedef char  **charPP;
-typedef int    *intP;
+typedef char **charPP;
+typedef int *intP;
 
 /* ----------------------------------------------------------------
  *				hash-join hash table structures
@@ -39,43 +39,43 @@ typedef int    *intP;
  */
 typedef struct HashTableData
 {
-	int				nbuckets;
-	int				totalbuckets;
-	int				bucketsize;
-	IpcMemoryId		shmid;
-	RelativeAddr	top;		/* char* */
-	RelativeAddr	bottom;		/* char* */
-	RelativeAddr	overflownext;		/* char* */
-	RelativeAddr	batch;		/* char* */
-	RelativeAddr	readbuf;	/* char* */
-	int				nbatch;
-	RelativeAddr	outerbatchNames;	/* RelativeAddr* */
-	RelativeAddr	outerbatchPos;		/* RelativeAddr* */
-	RelativeAddr	innerbatchNames;	/* RelativeAddr* */
-	RelativeAddr	innerbatchPos;		/* RelativeAddr* */
-	RelativeAddr	innerbatchSizes;	/* int* */
-	int				curbatch;
-	int				nprocess;
-	int				pcount;
-}				HashTableData;	/* real hash table follows here */
+	int			nbuckets;
+	int			totalbuckets;
+	int			bucketsize;
+	IpcMemoryId shmid;
+	RelativeAddr top;			/* char* */
+	RelativeAddr bottom;		/* char* */
+	RelativeAddr overflownext;	/* char* */
+	RelativeAddr batch;			/* char* */
+	RelativeAddr readbuf;		/* char* */
+	int			nbatch;
+	RelativeAddr outerbatchNames;		/* RelativeAddr* */
+	RelativeAddr outerbatchPos; /* RelativeAddr* */
+	RelativeAddr innerbatchNames;		/* RelativeAddr* */
+	RelativeAddr innerbatchPos; /* RelativeAddr* */
+	RelativeAddr innerbatchSizes;		/* int* */
+	int			curbatch;
+	int			nprocess;
+	int			pcount;
+}			HashTableData;		/* real hash table follows here */
 
 typedef HashTableData *HashJoinTable;
 
 typedef struct OverflowTupleData
 {
-	RelativeAddr	tuple;		/* HeapTuple */
-	RelativeAddr	next;		/* struct OverflowTupleData * */
-}				OverflowTupleData;		/* real tuple follows here */
+	RelativeAddr tuple;			/* HeapTuple */
+	RelativeAddr next;			/* struct OverflowTupleData * */
+}			OverflowTupleData;	/* real tuple follows here */
 
 typedef OverflowTupleData *OverflowTuple;
 
 typedef struct HashBucketData
 {
-	RelativeAddr	top;		/* HeapTuple */
-	RelativeAddr	bottom;		/* HeapTuple */
-	RelativeAddr	firstotuple;/* OverflowTuple */
-	RelativeAddr	lastotuple; /* OverflowTuple */
-}				HashBucketData; /* real bucket follows here */
+	RelativeAddr top;			/* HeapTuple */
+	RelativeAddr bottom;		/* HeapTuple */
+	RelativeAddr firstotuple;	/* OverflowTuple */
+	RelativeAddr lastotuple;	/* OverflowTuple */
+}			HashBucketData;		/* real bucket follows here */
 
 typedef HashBucketData *HashBucket;
 
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index bae4f1bc726..01110ba9fc2 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAgg.h,v 1.2 1997/09/07 04:57:50 momjian Exp $
+ * $Id: nodeAgg.h,v 1.3 1997/09/08 02:36:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,8 @@
 #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 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 2aa98a67c5b..0ad131a7c4e 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.3 1997/09/07 04:57:51 momjian Exp $
+ * $Id: nodeAppend.h,v 1.4 1997/09/08 02:36:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEAPPEND_H
 #define NODEAPPEND_H
 
-extern bool		ExecInitAppend(Append * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsAppend(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);
+extern void ExecEndAppend(Append * node);
 
 #endif							/* NODEAPPEND_H */
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index ddf32d766a5..26d398d8bb5 100644
--- a/src/include/executor/nodeGroup.h
+++ b/src/include/executor/nodeGroup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeGroup.h,v 1.2 1997/09/07 04:57:52 momjian Exp $
+ * $Id: nodeGroup.h,v 1.3 1997/09/08 02:36:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,8 @@
 #define NODEGROUP_H
 
 extern TupleTableSlot *ExecGroup(Group * node);
-extern bool		ExecInitGroup(Group * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsGroup(Group * node);
-extern void		ExecEndGroup(Group * node);
+extern bool ExecInitGroup(Group * node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsGroup(Group * node);
+extern void ExecEndGroup(Group * node);
 
 #endif							/* NODEGROUP_H */
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 561e192aaf5..c18403b030f 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHash.h,v 1.3 1997/09/07 04:57:52 momjian Exp $
+ * $Id: nodeHash.h,v 1.4 1997/09/08 02:36:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,21 +14,21 @@
 #define NODEHASH_H
 
 extern TupleTableSlot *ExecHash(Hash * node);
-extern bool		ExecInitHash(Hash * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsHash(Hash * node);
-extern void		ExecEndHash(Hash * node);
+extern bool ExecInitHash(Hash * node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsHash(Hash * node);
+extern void ExecEndHash(Hash * node);
 extern HashJoinTable ExecHashTableCreate(Hash * node);
 extern void
 ExecHashTableInsert(HashJoinTable hashtable, ExprContext * econtext,
 					Var * hashkey, File * batches);
-extern void		ExecHashTableDestroy(HashJoinTable hashtable);
+extern void ExecHashTableDestroy(HashJoinTable hashtable);
 extern int
 ExecHashGetBucket(HashJoinTable hashtable, ExprContext * econtext,
 				  Var * hashkey);
-extern HeapTuple
+extern		HeapTuple
 ExecScanHashBucket(HashJoinState * hjstate, HashBucket bucket,
 				   HeapTuple curtuple, List * hjclauses,
 				   ExprContext * econtext);
-extern void		ExecHashTableReset(HashJoinTable hashtable, int ntuples);
+extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples);
 
 #endif							/* NODEHASH_H */
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 17d88862432..e26f92c65fc 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHashjoin.h,v 1.3 1997/09/07 04:57:53 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.4 1997/09/08 02:36:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,13 +15,13 @@
 
 extern TupleTableSlot *ExecHashJoin(HashJoin * node);
 
-extern bool		ExecInitHashJoin(HashJoin * node, EState * estate, Plan * parent);
+extern bool ExecInitHashJoin(HashJoin * node, EState * estate, Plan * parent);
 
-extern int		ExecCountSlotsHashJoin(HashJoin * node);
+extern int	ExecCountSlotsHashJoin(HashJoin * node);
 
-extern void		ExecEndHashJoin(HashJoin * node);
+extern void ExecEndHashJoin(HashJoin * node);
 
-extern char    *
+extern char *
 ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer,
 					  File file, char *position);
 
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index e111f7ed2ee..4137ec90f7b 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeIndexscan.h,v 1.3 1997/09/07 04:57:54 momjian Exp $
+ * $Id: nodeIndexscan.h,v 1.4 1997/09/08 02:36:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,20 +15,20 @@
 
 extern TupleTableSlot *ExecIndexScan(IndexScan * node);
 
-extern void		ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent);
+extern void ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent);
 
-extern void		ExecEndIndexScan(IndexScan * node);
+extern void ExecEndIndexScan(IndexScan * node);
 
-extern void		ExecIndexMarkPos(IndexScan * node);
+extern void ExecIndexMarkPos(IndexScan * node);
 
-extern void		ExecIndexRestrPos(IndexScan * node);
+extern void ExecIndexRestrPos(IndexScan * node);
 
-extern void		ExecUpdateIndexScanKeys(IndexScan * node, ExprContext * econtext);
+extern void ExecUpdateIndexScanKeys(IndexScan * node, ExprContext * econtext);
 
-extern bool		ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent);
+extern bool ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent);
 
-extern int		ExecCountSlotsIndexScan(IndexScan * node);
+extern int	ExecCountSlotsIndexScan(IndexScan * node);
 
-extern void		ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent);
+extern void ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent);
 
 #endif							/* NODEINDEXSCAN_H */
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index c1833b11594..cd97d6b3c9a 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMaterial.h,v 1.2 1997/09/07 04:57:55 momjian Exp $
+ * $Id: nodeMaterial.h,v 1.3 1997/09/08 02:36:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,10 +14,10 @@
 #define NODEMATERIAL_H
 
 extern TupleTableSlot *ExecMaterial(Material * node);
-extern bool		ExecInitMaterial(Material * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsMaterial(Material * node);
-extern void		ExecEndMaterial(Material * node);
-extern List		ExecMaterialMarkPos(Material * node);
-extern void		ExecMaterialRestrPos(Material * node);
+extern bool ExecInitMaterial(Material * node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsMaterial(Material * node);
+extern void ExecEndMaterial(Material * node);
+extern List ExecMaterialMarkPos(Material * node);
+extern void ExecMaterialRestrPos(Material * node);
 
 #endif							/* NODEMATERIAL_H */
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index 7e496734b44..5bd870fabd4 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMergejoin.h,v 1.4 1997/09/07 04:57:56 momjian Exp $
+ * $Id: nodeMergejoin.h,v 1.5 1997/09/08 02:36:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,10 @@
 
 extern TupleTableSlot *ExecMergeJoin(MergeJoin * node);
 
-extern bool		ExecInitMergeJoin(MergeJoin * node, EState * estate, Plan * parent);
+extern bool ExecInitMergeJoin(MergeJoin * node, EState * estate, Plan * parent);
 
-extern int		ExecCountSlotsMergeJoin(MergeJoin * node);
+extern int	ExecCountSlotsMergeJoin(MergeJoin * node);
 
-extern void		ExecEndMergeJoin(MergeJoin * node);
+extern void ExecEndMergeJoin(MergeJoin * node);
 
 #endif							/* NODEMERGEJOIN_H; */
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index 8b387841e60..f68539e2929 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeNestloop.h,v 1.2 1997/09/07 04:57:57 momjian Exp $
+ * $Id: nodeNestloop.h,v 1.3 1997/09/08 02:36:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,8 @@
 #define NODENESTLOOP_H
 
 extern TupleTableSlot *ExecNestLoop(NestLoop * node, Plan * parent);
-extern bool		ExecInitNestLoop(NestLoop * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsNestLoop(NestLoop * node);
-extern void		ExecEndNestLoop(NestLoop * node);
+extern bool ExecInitNestLoop(NestLoop * node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsNestLoop(NestLoop * node);
+extern void ExecEndNestLoop(NestLoop * node);
 
 #endif							/* NODENESTLOOP_H */
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index 40ef4a7b4da..2dcb411db94 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeResult.h,v 1.2 1997/09/07 04:57:58 momjian Exp $
+ * $Id: nodeResult.h,v 1.3 1997/09/08 02:36:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,8 @@
 #define NODERESULT_H
 
 extern TupleTableSlot *ExecResult(Result * node);
-extern bool		ExecInitResult(Result * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsResult(Result * node);
-extern void		ExecEndResult(Result * node);
+extern bool ExecInitResult(Result * node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsResult(Result * node);
+extern void ExecEndResult(Result * node);
 
 #endif							/* NODERESULT_H */
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index 56237dc80d4..22154ea1f2c 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSeqscan.h,v 1.3 1997/09/07 04:57:59 momjian Exp $
+ * $Id: nodeSeqscan.h,v 1.4 1997/09/08 02:36:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,11 +14,11 @@
 #define NODESEQSCAN_H
 
 extern TupleTableSlot *ExecSeqScan(SeqScan * node);
-extern bool		ExecInitSeqScan(SeqScan * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsSeqScan(SeqScan * node);
-extern void		ExecEndSeqScan(SeqScan * node);
-extern void		ExecSeqReScan(SeqScan * node, ExprContext * exprCtxt, Plan * parent);
-extern void		ExecSeqMarkPos(SeqScan * node);
-extern void		ExecSeqRestrPos(SeqScan * node);
+extern bool ExecInitSeqScan(SeqScan * node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsSeqScan(SeqScan * node);
+extern void ExecEndSeqScan(SeqScan * node);
+extern void ExecSeqReScan(SeqScan * node, ExprContext * exprCtxt, Plan * parent);
+extern void ExecSeqMarkPos(SeqScan * node);
+extern void ExecSeqRestrPos(SeqScan * node);
 
 #endif							/* NODESEQSCAN_H */
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index 428805702eb..a4c0a1b388c 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSort.h,v 1.2 1997/09/07 04:58:00 momjian Exp $
+ * $Id: nodeSort.h,v 1.3 1997/09/08 02:36:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,10 +14,10 @@
 #define NODESORT_H
 
 extern TupleTableSlot *ExecSort(Sort * node);
-extern bool		ExecInitSort(Sort * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsSort(Sort * node);
-extern void		ExecEndSort(Sort * node);
-extern void		ExecSortMarkPos(Sort * node);
-extern void		ExecSortRestrPos(Sort * node);
+extern bool ExecInitSort(Sort * node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsSort(Sort * node);
+extern void ExecEndSort(Sort * node);
+extern void ExecSortMarkPos(Sort * node);
+extern void ExecSortRestrPos(Sort * node);
 
 #endif							/* NODESORT_H */
diff --git a/src/include/executor/nodeTee.h b/src/include/executor/nodeTee.h
index 7235030d670..a0fb3831424 100644
--- a/src/include/executor/nodeTee.h
+++ b/src/include/executor/nodeTee.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeTee.h,v 1.2 1997/09/07 04:58:00 momjian Exp $
+ * $Id: nodeTee.h,v 1.3 1997/09/08 02:36:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,9 +14,9 @@
 #define NODETEE_H
 
 extern TupleTableSlot *ExecTee(Tee * node, Plan * parent);
-extern bool		ExecInitTee(Tee * node, EState * estate, Plan * parent);
-extern void		ExecTeeReScan(Tee * node, ExprContext * exprCtxt, Plan * parent);
-extern void		ExecEndTee(Tee * node, Plan * parent);
-extern int		ExecCountSlotsTee(Tee * node);
+extern bool ExecInitTee(Tee * node, EState * estate, Plan * parent);
+extern void ExecTeeReScan(Tee * node, ExprContext * exprCtxt, Plan * parent);
+extern void ExecEndTee(Tee * node, Plan * parent);
+extern int	ExecCountSlotsTee(Tee * node);
 
 #endif							/* NODETEE_H */
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index c66fa827cab..24042581f34 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeUnique.h,v 1.2 1997/09/07 04:58:01 momjian Exp $
+ * $Id: nodeUnique.h,v 1.3 1997/09/08 02:36:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,8 @@
 #define NODEUNIQUE_H
 
 extern TupleTableSlot *ExecUnique(Unique * node);
-extern bool		ExecInitUnique(Unique * node, EState * estate, Plan * parent);
-extern int		ExecCountSlotsUnique(Unique * node);
-extern void		ExecEndUnique(Unique * node);
+extern bool ExecInitUnique(Unique * node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsUnique(Unique * node);
+extern void ExecEndUnique(Unique * node);
 
 #endif							/* NODEUNIQUE_H */
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index fee2056f9f8..34ffef800ab 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -36,11 +36,11 @@
 
 typedef struct
 {
-	uint32			alloced;	/* # of alloced vals */
-	uint32			free;		/* # of free vals */
-	TupleDesc		tupdesc;	/* tuple descriptor */
-	HeapTuple	   *vals;		/* tuples */
-}				SPITupleTable;
+	uint32		alloced;		/* # of alloced vals */
+	uint32		free;			/* # of free vals */
+	TupleDesc	tupdesc;		/* tuple descriptor */
+	HeapTuple  *vals;			/* tuples */
+}			SPITupleTable;
 
 #define SPI_ERROR_CONNECT		-1
 #define SPI_ERROR_COPY			-2
@@ -65,22 +65,22 @@ typedef struct
 #define SPI_OK_UPDATE			9
 #define SPI_OK_CURSOR			10
 
-extern uint32	SPI_processed;
+extern uint32 SPI_processed;
 extern SPITupleTable *SPI_tuptable;
-extern int		SPI_result;
+extern int	SPI_result;
 
-extern int		SPI_connect(void);
-extern int		SPI_finish(void);
-extern int		SPI_exec(char *src, int tcount);
-extern int		SPI_execp(void *plan, char **values, char *Nulls, int tcount);
-extern void    *SPI_prepare(char *src, int nargs, Oid * argtypes);
-extern void    *SPI_saveplan(void *plan);
+extern int	SPI_connect(void);
+extern int	SPI_finish(void);
+extern int	SPI_exec(char *src, int tcount);
+extern int	SPI_execp(void *plan, char **values, char *Nulls, int tcount);
+extern void *SPI_prepare(char *src, int nargs, Oid * argtypes);
+extern void *SPI_saveplan(void *plan);
 
-extern int		SPI_fnumber(TupleDesc tupdesc, char *fname);
-extern char    *SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber);
-extern char    *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull);
-extern char    *SPI_gettype(TupleDesc tupdesc, int fnumber);
-extern Oid		SPI_gettypeid(TupleDesc tupdesc, int fnumber);
-extern char    *SPI_getrelname(Relation rel);
+extern int	SPI_fnumber(TupleDesc tupdesc, char *fname);
+extern char *SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber);
+extern char *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull);
+extern char *SPI_gettype(TupleDesc tupdesc, int fnumber);
+extern Oid	SPI_gettypeid(TupleDesc tupdesc, int fnumber);
+extern char *SPI_getrelname(Relation rel);
 
 #endif							/* SPI_H */
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index fcef30cd8e4..ae824188163 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuptable.h,v 1.5 1997/09/07 04:58:03 momjian Exp $
+ * $Id: tuptable.h,v 1.6 1997/09/08 02:36:45 momjian Exp $
  *
  * NOTES
  *	  The tuple table interface is getting pretty ugly.
@@ -46,14 +46,14 @@
  */
 typedef struct TupleTableSlot
 {
-	NodeTag			type;
-	HeapTuple		val;
-	bool			ttc_shouldFree;
-	bool			ttc_descIsNew;
-	TupleDesc		ttc_tupleDescriptor;
-	Buffer			ttc_buffer;
-	int				ttc_whichplan;
-}				TupleTableSlot;
+	NodeTag		type;
+	HeapTuple	val;
+	bool		ttc_shouldFree;
+	bool		ttc_descIsNew;
+	TupleDesc	ttc_tupleDescriptor;
+	Buffer		ttc_buffer;
+	int			ttc_whichplan;
+}			TupleTableSlot;
 
 /* ----------------
  *		tuple table data structure
@@ -61,10 +61,10 @@ typedef struct TupleTableSlot
  */
 typedef struct TupleTableData
 {
-	int				size;		/* size of the table */
-	int				next;		/* next available slot number */
+	int			size;			/* size of the table */
+	int			next;			/* next available slot number */
 	TupleTableSlot *array;		/* array of TupleTableSlot's */
-}				TupleTableData;
+}			TupleTableData;
 
 typedef TupleTableData *TupleTable;
 
diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h
index 15a18d88c6f..af0c580cc93 100644
--- a/src/include/lib/dllist.h
+++ b/src/include/lib/dllist.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dllist.h,v 1.5 1997/09/07 04:58:07 momjian Exp $
+ * $Id: dllist.h,v 1.6 1997/09/08 02:36:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,32 +40,32 @@ struct Dlelem;
 
 typedef struct Dlelem
 {
-	struct Dlelem  *dle_next;	/* next element */
-	struct Dlelem  *dle_prev;	/* previous element */
-	void		   *dle_val;	/* value of the element */
-	struct Dllist  *dle_list;	/* what list this element is in */
-}				Dlelem;
+	struct Dlelem *dle_next;	/* next element */
+	struct Dlelem *dle_prev;	/* previous element */
+	void	   *dle_val;		/* value of the element */
+	struct Dllist *dle_list;	/* what list this element is in */
+}			Dlelem;
 
 typedef struct Dllist
 {
-	Dlelem		   *dll_head;
-	Dlelem		   *dll_tail;
-}				Dllist;
+	Dlelem	   *dll_head;
+	Dlelem	   *dll_tail;
+}			Dllist;
 
-extern Dllist  *DLNewList(void);/* initialize a new list */
-extern void		DLFreeList(Dllist *);	/* free up a list and all the
+extern Dllist *DLNewList(void); /* initialize a new list */
+extern void DLFreeList(Dllist *);		/* free up a list and all the
 										 * nodes in it */
-extern Dlelem  *DLNewElem(void *val);
-extern void		DLFreeElem(Dlelem *);
-extern Dlelem  *DLGetHead(Dllist *);
-extern Dlelem  *DLGetTail(Dllist *);
-extern Dlelem  *DLRemTail(Dllist * l);
-extern Dlelem  *DLGetPred(Dlelem *);	/* get predecessor */
-extern Dlelem  *DLGetSucc(Dlelem *);	/* get successor */
-extern void		DLRemove(Dlelem *);		/* removes node from list */
-extern void		DLAddHead(Dllist * list, Dlelem * node);
-extern void		DLAddTail(Dllist * list, Dlelem * node);
-extern Dlelem  *DLRemHead(Dllist * list);		/* remove and return the
+extern Dlelem *DLNewElem(void *val);
+extern void DLFreeElem(Dlelem *);
+extern Dlelem *DLGetHead(Dllist *);
+extern Dlelem *DLGetTail(Dllist *);
+extern Dlelem *DLRemTail(Dllist * l);
+extern Dlelem *DLGetPred(Dlelem *);		/* get predecessor */
+extern Dlelem *DLGetSucc(Dlelem *);		/* get successor */
+extern void DLRemove(Dlelem *); /* removes node from list */
+extern void DLAddHead(Dllist * list, Dlelem * node);
+extern void DLAddTail(Dllist * list, Dlelem * node);
+extern Dlelem *DLRemHead(Dllist * list);		/* remove and return the
 												 * head */
 
 #define DLE_VAL(x)	(x->dle_val)
diff --git a/src/include/lib/fstack.h b/src/include/lib/fstack.h
index 99f10b9006c..f5236c67bba 100644
--- a/src/include/lib/fstack.h
+++ b/src/include/lib/fstack.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fstack.h,v 1.3 1997/09/07 04:58:09 momjian Exp $
+ * $Id: fstack.h,v 1.4 1997/09/08 02:36:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,7 +39,7 @@ typedef FixedItemData *FixedItem;
 
 struct FixedItemData
 {
-	FixedItem		next;		/* next item or NULL */
+	FixedItem	next;			/* next item or NULL */
 };
 
 /*
@@ -48,10 +48,10 @@ struct FixedItemData
  */
 typedef struct FixedStackData
 {
-	FixedItem		top;		/* Top item on the stack or NULL */
-	Offset			offset;		/* Offset from struct base to item */
+	FixedItem	top;			/* Top item on the stack or NULL */
+	Offset		offset;			/* Offset from struct base to item */
 	/* this could be signed short int! */
-}				FixedStackData;
+}			FixedStackData;
 
 typedef FixedStackData *FixedStack;
 
@@ -62,7 +62,7 @@ typedef FixedStackData *FixedStack;
  * Exceptions:
  *		BadArg if stack is invalid pointer.
  */
-extern void		FixedStackInit(FixedStack stack, Offset offset);
+extern void FixedStackInit(FixedStack stack, Offset offset);
 
 /*
  * FixedStackPop --
@@ -71,7 +71,7 @@ extern void		FixedStackInit(FixedStack stack, Offset offset);
  * Exceptions:
  *		BadArg if stack is invalid.
  */
-Pointer			FixedStackPop(FixedStack stack);
+Pointer		FixedStackPop(FixedStack stack);
 
 /*
  * FixedStackPush --
@@ -81,7 +81,7 @@ Pointer			FixedStackPop(FixedStack stack);
  *		BadArg if stack is invalid.
  *		BadArg if pointer is invalid.
  */
-extern void		FixedStackPush(FixedStack stack, Pointer pointer);
+extern void FixedStackPush(FixedStack stack, Pointer pointer);
 
 /*
  * FixedStackGetTop --
@@ -94,7 +94,7 @@ extern void		FixedStackPush(FixedStack stack, Pointer pointer);
  * Exceptions:
  *		BadArg if stack is invalid.
  */
-extern Pointer	FixedStackGetTop(FixedStack stack);
+extern Pointer FixedStackGetTop(FixedStack stack);
 
 /*
  * FixedStackGetNext --
@@ -109,6 +109,6 @@ extern Pointer	FixedStackGetTop(FixedStack stack);
  *		BadArg if pointer is invalid.
  *		BadArg if stack does not contain pointer.
  */
-extern Pointer	FixedStackGetNext(FixedStack stack, Pointer pointer);
+extern Pointer FixedStackGetNext(FixedStack stack, Pointer pointer);
 
 #endif							/* FSTACK_H */
diff --git a/src/include/lib/hasht.h b/src/include/lib/hasht.h
index 1d28c2ca28f..4c036f8e25c 100644
--- a/src/include/lib/hasht.h
+++ b/src/include/lib/hasht.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hasht.h,v 1.3 1997/09/07 04:58:11 momjian Exp $
+ * $Id: hasht.h,v 1.4 1997/09/08 02:36:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,8 +16,8 @@
 
 #include <utils/hsearch.h>
 
-typedef void	(*HashtFunc) ();
+typedef void (*HashtFunc) ();
 
-extern void		HashTableWalk(HTAB * hashtable, HashtFunc function, int arg);
+extern void HashTableWalk(HTAB * hashtable, HashtFunc function, int arg);
 
 #endif							/* HASHT_H */
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index f127d8cdd01..b2b71ef27d0 100644
--- a/src/include/lib/stringinfo.h
+++ b/src/include/lib/stringinfo.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: stringinfo.h,v 1.3 1997/09/07 04:58:14 momjian Exp $
+ * $Id: stringinfo.h,v 1.4 1997/09/08 02:36:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,10 +25,10 @@
  */
 typedef struct StringInfoData
 {
-	char		   *data;
-	int				maxlen;
-	int				len;
-}				StringInfoData;
+	char	   *data;
+	int			maxlen;
+	int			len;
+}			StringInfoData;
 
 typedef StringInfoData *StringInfo;
 
@@ -42,6 +42,6 @@ extern StringInfo makeStringInfo(void);
  * appendStringInfo
  * similar to 'strcat' but reallocates more space if necessary...
  */
-extern void		appendStringInfo(StringInfo str, char *buffer);
+extern void appendStringInfo(StringInfo str, char *buffer);
 
 #endif							/* STRINGINFO_H */
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index a159b7a5ebd..11f57f1b9e9 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: auth.h,v 1.5 1997/09/07 04:58:16 momjian Exp $
+ * $Id: auth.h,v 1.6 1997/09/08 02:36:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,12 +30,12 @@
 #define DEFAULT_CLIENT_AUTHSVC	"kerberos"
 #endif							/* KRB4 || KRB5 */
 
-extern int		fe_sendauth(MsgType msgtype, Port * port, char *hostname);
-extern void		fe_setauthsvc(char *name);
-extern MsgType	fe_getauthsvc();
-extern char    *fe_getauthname(void);
-extern int		be_recvauth(MsgType msgtype, Port * port, char *username, StartupInfo * sp);
-extern void		be_setauthsvc(char *name);
+extern int	fe_sendauth(MsgType msgtype, Port * port, char *hostname);
+extern void fe_setauthsvc(char *name);
+extern MsgType fe_getauthsvc();
+extern char *fe_getauthname(void);
+extern int	be_recvauth(MsgType msgtype, Port * port, char *username, StartupInfo * sp);
+extern void be_setauthsvc(char *name);
 
 /* the value that matches any dbName value when doing
    host based authentication*/
diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h
index 2ea347a9b3e..2aef0e6a403 100644
--- a/src/include/libpq/be-fsstubs.h
+++ b/src/include/libpq/be-fsstubs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: be-fsstubs.h,v 1.3 1997/09/07 04:58:18 momjian Exp $
+ * $Id: be-fsstubs.h,v 1.4 1997/09/08 02:37:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,20 +21,20 @@
 #define LOread(f,l) loread(f,l)
 #define LOwrite(f,b) lowrite(f,b)
 
-extern Oid		lo_import(text * filename);
-extern int4		lo_export(Oid lobjId, text * filename);
+extern Oid	lo_import(text * filename);
+extern int4 lo_export(Oid lobjId, text * filename);
 
-extern Oid		lo_creat(int mode);
+extern Oid	lo_creat(int mode);
 
-extern int		lo_open(Oid lobjId, int mode);
-extern int		lo_close(int fd);
-extern int		lo_read(int fd, char *buf, int len);
-extern int		lo_write(int fd, char *buf, int len);
-extern int		lo_lseek(int fd, int offset, int whence);
-extern int		lo_tell(int fd);
-extern int		lo_unlink(Oid lobjId);
+extern int	lo_open(Oid lobjId, int mode);
+extern int	lo_close(int fd);
+extern int	lo_read(int fd, char *buf, int len);
+extern int	lo_write(int fd, char *buf, int len);
+extern int	lo_lseek(int fd, int offset, int whence);
+extern int	lo_tell(int fd);
+extern int	lo_unlink(Oid lobjId);
 
 extern struct varlena *loread(int fd, int len);
-extern int		lowrite(int fd, struct varlena * wbuf);
+extern int	lowrite(int fd, struct varlena * wbuf);
 
 #endif							/* BE_FSSTUBS_H */
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 4550461d06e..bddfa1888b4 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-be.h,v 1.5 1997/09/07 04:58:20 momjian Exp $
+ * $Id: libpq-be.h,v 1.6 1997/09/08 02:37:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,24 +30,24 @@
  */
 
 /* in be-dumpdata.c */
-extern void		be_portalinit(void);
-extern void		be_portalpush(PortalEntry * entry);
+extern void be_portalinit(void);
+extern void be_portalpush(PortalEntry * entry);
 extern PortalEntry *be_portalpop(void);
 extern PortalEntry *be_currentportal(void);
 extern PortalEntry *be_newportal(void);
 extern void
 be_typeinit(PortalEntry * entry, TupleDesc attrs,
 			int natts);
-extern void		be_printtup(HeapTuple tuple, TupleDesc typeinfo);
+extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo);
 
 
 /* in be-pqexec.c */
-extern char    *
+extern char *
 PQfn(int fnid, int *result_buf, int result_len, int result_is_int,
 	 PQArgBlock * args, int nargs);
-extern char    *PQexec(char *query);
-extern int		pqtest_PQexec(char *q);
-extern int		pqtest_PQfn(char *q);
-extern int32	pqtest(struct varlena * vlena);
+extern char *PQexec(char *query);
+extern int	pqtest_PQexec(char *q);
+extern int	pqtest_PQfn(char *q);
+extern int32 pqtest(struct varlena * vlena);
 
 #endif							/* LIBPQ_BE_H */
diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h
index 4e7f4e37a2e..ffa20f634d9 100644
--- a/src/include/libpq/libpq-fs.h
+++ b/src/include/libpq/libpq-fs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fs.h,v 1.4 1997/09/07 04:58:22 momjian Exp $
+ * $Id: libpq-fs.h,v 1.5 1997/09/08 02:37:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,9 @@
 
 struct pgdirent
 {
-	unsigned long	d_ino;
-	unsigned short	d_namlen;
-	char			d_name[MAXNAMLEN + 1];
+	unsigned long d_ino;
+	unsigned short d_namlen;
+	char		d_name[MAXNAMLEN + 1];
 };
 
 /*
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index 1b074cba118..e983a91c0fe 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq.h,v 1.6 1997/09/07 04:58:24 momjian Exp $
+ * $Id: libpq.h,v 1.7 1997/09/08 02:37:08 momjian Exp $
  *
  * NOTES
  *	  This file contains definitions for structures and
@@ -29,14 +29,14 @@
  */
 typedef struct
 {
-	int				len;
-	int				isint;
+	int			len;
+	int			isint;
 	union
 	{
-		int			   *ptr;	/* can't use void (dec compiler barfs)	 */
-		int				integer;
-	}				u;
-}				PQArgBlock;
+		int		   *ptr;		/* can't use void (dec compiler barfs)	 */
+		int			integer;
+	}			u;
+}			PQArgBlock;
 
 /* ----------------
  * TypeBlock --
@@ -47,10 +47,10 @@ typedef struct
 
 typedef struct TypeBlock
 {
-	char			name[NAMEDATALEN];	/* name of the attribute */
-	int				adtid;		/* adtid of the type */
-	int				adtsize;	/* adtsize of the type */
-}				TypeBlock;
+	char		name[NAMEDATALEN];		/* name of the attribute */
+	int			adtid;			/* adtid of the type */
+	int			adtsize;		/* adtsize of the type */
+}			TypeBlock;
 
 /* ----------------
  * TupleBlock --
@@ -61,12 +61,12 @@ typedef struct TypeBlock
 
 typedef struct TupleBlock
 {
-	char		  **values[TupleBlockSize];		/* an array of tuples */
-	int			   *lengths[TupleBlockSize];	/* an array of length vec.
+	char	  **values[TupleBlockSize]; /* an array of tuples */
+	int		   *lengths[TupleBlockSize];		/* an array of length vec.
 												 * foreach tuple */
 	struct TupleBlock *next;	/* next tuple block */
-	int				tuple_index;/* current tuple index */
-}				TupleBlock;
+	int			tuple_index;	/* current tuple index */
+}			TupleBlock;
 
 /* ----------------
  * GroupBuffer --
@@ -75,12 +75,12 @@ typedef struct TupleBlock
  */
 typedef struct GroupBuffer
 {
-	int				no_tuples;	/* number of tuples in this group */
-	int				no_fields;	/* number of attributes */
-	TypeBlock	   *types;		/* types of the attributes */
-	TupleBlock	   *tuples;		/* tuples in this group */
+	int			no_tuples;		/* number of tuples in this group */
+	int			no_fields;		/* number of attributes */
+	TypeBlock  *types;			/* types of the attributes */
+	TupleBlock *tuples;			/* tuples in this group */
 	struct GroupBuffer *next;	/* next group */
-}				GroupBuffer;
+}			GroupBuffer;
 
 /* ----------------
  * PortalBuffer --
@@ -89,11 +89,11 @@ typedef struct GroupBuffer
  */
 typedef struct PortalBuffer
 {
-	int				rule_p;		/* 1 if this is an asynchronized portal. */
-	int				no_tuples;	/* number of tuples in this portal buffer */
-	int				no_groups;	/* number of tuple groups */
-	GroupBuffer    *groups;		/* linked list of tuple groups */
-}				PortalBuffer;
+	int			rule_p;			/* 1 if this is an asynchronized portal. */
+	int			no_tuples;		/* number of tuples in this portal buffer */
+	int			no_groups;		/* number of tuple groups */
+	GroupBuffer *groups;		/* linked list of tuple groups */
+}			PortalBuffer;
 
 /* ----------------
  * PortalEntry --
@@ -107,30 +107,30 @@ typedef struct PortalBuffer
 
 typedef struct PortalEntry
 {
-	char			name[PortalNameLength];		/* name of this portal */
-	PortalBuffer   *portal;		/* tuples contained in this portal */
-	Pointer			portalcxt;	/* memory context (for backend) */
-	Pointer			result;		/* result for PQexec */
-}				PortalEntry;
+	char		name[PortalNameLength]; /* name of this portal */
+	PortalBuffer *portal;		/* tuples contained in this portal */
+	Pointer		portalcxt;		/* memory context (for backend) */
+	Pointer		result;			/* result for PQexec */
+}			PortalEntry;
 
 #define PORTALS_INITIAL_SIZE 32
 #define PORTALS_GROW_BY		 32
 
 /* in portalbuf.c */
 extern PortalEntry **portals;
-extern size_t	portals_array_size;
+extern size_t portals_array_size;
 
 /*
  *	Asynchronous notification
  */
 typedef struct PQNotifyList
 {
-	char			relname[NAMEDATALEN];		/* name of relation
-												 * containing data */
-	int				be_pid;		/* process id of backend */
-	int				valid;		/* has this already been handled by user. */
+	char		relname[NAMEDATALEN];	/* name of relation containing
+										 * data */
+	int			be_pid;			/* process id of backend */
+	int			valid;			/* has this already been handled by user. */
 /*	  SLNode Node; */
-}				PQNotifyList;
+}			PQNotifyList;
 
 /*
  * Exceptions.
@@ -141,9 +141,9 @@ typedef struct PQNotifyList
 
 /* in portal.c */
 extern Exception MemoryError,
-				PortalError,
-				PostquelError,
-				ProtocolError;
+			PortalError,
+			PostquelError,
+			ProtocolError;
 
 /*
  * POSTGRES backend dependent Constants.
@@ -154,7 +154,7 @@ extern Exception MemoryError,
 #define COMMAND_LENGTH 20
 #define REMARK_LENGTH 80
 
-extern char		PQerrormsg[ERROR_MSG_LENGTH];	/* in portal.c */
+extern char PQerrormsg[ERROR_MSG_LENGTH];		/* in portal.c */
 
 /*
  * External functions.
@@ -163,22 +163,22 @@ extern char		PQerrormsg[ERROR_MSG_LENGTH];	/* in portal.c */
 /*
  * prototypes for functions in portal.c
  */
-extern void		pqdebug(char *target, char *msg);
-extern void		pqdebug2(char *target, char *msg1, char *msg2);
-extern void		PQtrace(void);
-extern void		PQuntrace(void);
-extern int		PQnportals(int rule_p);
-extern void		PQpnames(char **pnames, int rule_p);
+extern void pqdebug(char *target, char *msg);
+extern void pqdebug2(char *target, char *msg1, char *msg2);
+extern void PQtrace(void);
+extern void PQuntrace(void);
+extern int	PQnportals(int rule_p);
+extern void PQpnames(char **pnames, int rule_p);
 extern PortalBuffer *PQparray(char *pname);
-extern int		PQrulep(PortalBuffer * portal);
-extern int		PQntuples(PortalBuffer * portal);
-extern int		PQninstances(PortalBuffer * portal);
-extern int		PQngroups(PortalBuffer * portal);
-extern int		PQntuplesGroup(PortalBuffer * portal, int group_index);
-extern int		PQninstancesGroup(PortalBuffer * portal, int group_index);
-extern int		PQnfieldsGroup(PortalBuffer * portal, int group_index);
-extern int		PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name);
-extern char    *PQfnameGroup(PortalBuffer * portal, int group_index, int field_number);
+extern int	PQrulep(PortalBuffer * portal);
+extern int	PQntuples(PortalBuffer * portal);
+extern int	PQninstances(PortalBuffer * portal);
+extern int	PQngroups(PortalBuffer * portal);
+extern int	PQntuplesGroup(PortalBuffer * portal, int group_index);
+extern int	PQninstancesGroup(PortalBuffer * portal, int group_index);
+extern int	PQnfieldsGroup(PortalBuffer * portal, int group_index);
+extern int	PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name);
+extern char *PQfnameGroup(PortalBuffer * portal, int group_index, int field_number);
 extern int
 PQftypeGroup(PortalBuffer * portal, int group_index,
 			 int field_number);
@@ -186,79 +186,79 @@ extern int
 PQfsizeGroup(PortalBuffer * portal, int group_index,
 			 int field_number);
 extern GroupBuffer *PQgroup(PortalBuffer * portal, int tuple_index);
-extern int		PQgetgroup(PortalBuffer * portal, int tuple_index);
-extern int		PQnfields(PortalBuffer * portal, int tuple_index);
-extern int		PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name);
-extern char    *PQfname(PortalBuffer * portal, int tuple_index, int field_number);
-extern int		PQftype(PortalBuffer * portal, int tuple_index, int field_number);
-extern int		PQfsize(PortalBuffer * portal, int tuple_index, int field_number);
-extern int		PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2);
-extern char    *PQgetvalue(PortalBuffer * portal, int tuple_index, int field_number);
-extern char    *PQgetAttr(PortalBuffer * portal, int tuple_index, int field_number);
-extern int		PQgetlength(PortalBuffer * portal, int tuple_index, int field_number);
-extern void		PQclear(char *pname);
-extern void		PQcleanNotify(void);
-extern void		PQnotifies_init(void);
+extern int	PQgetgroup(PortalBuffer * portal, int tuple_index);
+extern int	PQnfields(PortalBuffer * portal, int tuple_index);
+extern int	PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name);
+extern char *PQfname(PortalBuffer * portal, int tuple_index, int field_number);
+extern int	PQftype(PortalBuffer * portal, int tuple_index, int field_number);
+extern int	PQfsize(PortalBuffer * portal, int tuple_index, int field_number);
+extern int	PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2);
+extern char *PQgetvalue(PortalBuffer * portal, int tuple_index, int field_number);
+extern char *PQgetAttr(PortalBuffer * portal, int tuple_index, int field_number);
+extern int	PQgetlength(PortalBuffer * portal, int tuple_index, int field_number);
+extern void PQclear(char *pname);
+extern void PQcleanNotify(void);
+extern void PQnotifies_init(void);
 extern PQNotifyList *PQnotifies(void);
-extern void		PQremoveNotify(PQNotifyList * nPtr);
-extern void		PQappendNotify(char *relname, int pid);
+extern void PQremoveNotify(PQNotifyList * nPtr);
+extern void PQappendNotify(char *relname, int pid);
 
 /*
  * prototypes for functions in portalbuf.c
  */
-extern caddr_t	pbuf_alloc(size_t size);
-extern void		pbuf_free(caddr_t pointer);
+extern caddr_t pbuf_alloc(size_t size);
+extern void pbuf_free(caddr_t pointer);
 extern PortalBuffer *pbuf_addPortal(void);
 extern GroupBuffer *pbuf_addGroup(PortalBuffer * portal);
 extern TypeBlock *pbuf_addTypes(int n);
 extern TupleBlock *pbuf_addTuples(void);
-extern char   **pbuf_addTuple(int n);
-extern int	   *pbuf_addTupleValueLengths(int n);
-extern char    *pbuf_addValues(int n);
+extern char **pbuf_addTuple(int n);
+extern int *pbuf_addTupleValueLengths(int n);
+extern char *pbuf_addValues(int n);
 extern PortalEntry *pbuf_addEntry(void);
-extern void		pbuf_freeEntry(int i);
-extern void		pbuf_freeTypes(TypeBlock * types);
-extern void		pbuf_freeTuples(TupleBlock * tuples, int no_tuples, int no_fields);
-extern void		pbuf_freeGroup(GroupBuffer * group);
-extern void		pbuf_freePortal(PortalBuffer * portal);
-extern int		pbuf_getIndex(char *pname);
-extern void		pbuf_setportalinfo(PortalEntry * entry, char *pname);
+extern void pbuf_freeEntry(int i);
+extern void pbuf_freeTypes(TypeBlock * types);
+extern void pbuf_freeTuples(TupleBlock * tuples, int no_tuples, int no_fields);
+extern void pbuf_freeGroup(GroupBuffer * group);
+extern void pbuf_freePortal(PortalBuffer * portal);
+extern int	pbuf_getIndex(char *pname);
+extern void pbuf_setportalinfo(PortalEntry * entry, char *pname);
 extern PortalEntry *pbuf_setup(char *pname);
-extern void		pbuf_close(char *pname);
+extern void pbuf_close(char *pname);
 extern GroupBuffer *pbuf_findGroup(PortalBuffer * portal, int group_index);
-extern int		pbuf_findFnumber(GroupBuffer * group, char *field_name);
-extern void		pbuf_checkFnumber(GroupBuffer * group, int field_number);
-extern char    *pbuf_findFname(GroupBuffer * group, int field_number);
+extern int	pbuf_findFnumber(GroupBuffer * group, char *field_name);
+extern void pbuf_checkFnumber(GroupBuffer * group, int field_number);
+extern char *pbuf_findFname(GroupBuffer * group, int field_number);
 
 /*
  * prototypes for functions in pqcomm.c
  */
-extern void		pq_init(int fd);
-extern void		pq_gettty(char *tp);
-extern int		pq_getport(void);
-extern void		pq_close(void);
-extern void		pq_flush(void);
-extern int		pq_getstr(char *s, int maxlen);
-extern int		PQgetline(char *s, int maxlen);
-extern int		PQputline(char *s);
-extern int		pq_getnchar(char *s, int off, int maxlen);
-extern int		pq_getint(int b);
-extern void		pq_putstr(char *s);
-extern void		pq_putnchar(char *s, int n);
-extern void		pq_putint(int i, int b);
-extern int		pq_sendoob(char *msg, int len);
-extern int		pq_recvoob(char *msgPtr, int *lenPtr);
-extern int		pq_getinaddr(struct sockaddr_in * sin, char *host, int port);
-extern int		pq_getinserv(struct sockaddr_in * sin, char *host, char *serv);
+extern void pq_init(int fd);
+extern void pq_gettty(char *tp);
+extern int	pq_getport(void);
+extern void pq_close(void);
+extern void pq_flush(void);
+extern int	pq_getstr(char *s, int maxlen);
+extern int	PQgetline(char *s, int maxlen);
+extern int	PQputline(char *s);
+extern int	pq_getnchar(char *s, int off, int maxlen);
+extern int	pq_getint(int b);
+extern void pq_putstr(char *s);
+extern void pq_putnchar(char *s, int n);
+extern void pq_putint(int i, int b);
+extern int	pq_sendoob(char *msg, int len);
+extern int	pq_recvoob(char *msgPtr, int *lenPtr);
+extern int	pq_getinaddr(struct sockaddr_in * sin, char *host, int port);
+extern int	pq_getinserv(struct sockaddr_in * sin, char *host, char *serv);
 extern int
 pq_connect(char *dbname, char *user, char *args, char *hostName,
 		   char *debugTty, char *execFile, short portName);
-extern int		StreamOpen(char *hostName, short portName, Port * port);
-extern void		pq_regoob(void (*fptr) ());
-extern void		pq_unregoob(void);
-extern void		pq_async_notify(void);
-extern int		StreamServerPort(char *hostName, short portName, int *fdP);
-extern int		StreamConnection(int server_fd, Port * port);
-extern void		StreamClose(int sock);
+extern int	StreamOpen(char *hostName, short portName, Port * port);
+extern void pq_regoob(void (*fptr) ());
+extern void pq_unregoob(void);
+extern void pq_async_notify(void);
+extern int	StreamServerPort(char *hostName, short portName, int *fdP);
+extern int	StreamConnection(int server_fd, Port * port);
+extern void StreamClose(int sock);
 
 #endif							/* LIBPQ_H */
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 3aceb3de5b4..83c76aa2690 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.11 1997/09/07 04:58:26 momjian Exp $
+ * $Id: pqcomm.h,v 1.12 1997/09/08 02:37:08 momjian Exp $
  *
  * NOTES
  *	  Some of this should move to libpq.h
@@ -62,19 +62,19 @@ typedef enum _MsgType
 
 #define LAST_AUTHENTICATION_TYPE 14
 
-typedef char   *Addr;
-typedef int		PacketLen;		/* packet length */
+typedef char *Addr;
+typedef int PacketLen;			/* packet length */
 
 
 typedef struct StartupInfo
 {
 /*	   PacketHdr		hdr; */
-	char			database[PATH_SIZE];		/* database name */
-	char			user[NAMEDATALEN];	/* user name */
-	char			options[ARGV_SIZE]; /* possible additional args */
-	char			execFile[ARGV_SIZE];		/* possible backend to use */
-	char			tty[PATH_SIZE];		/* possible tty for debug output */
-}				StartupInfo;
+	char		database[PATH_SIZE];	/* database name */
+	char		user[NAMEDATALEN];		/* user name */
+	char		options[ARGV_SIZE];		/* possible additional args */
+	char		execFile[ARGV_SIZE];	/* possible backend to use */
+	char		tty[PATH_SIZE]; /* possible tty for debug output */
+}			StartupInfo;
 
 /* amount of available data in a packet buffer */
 #define MESSAGE_SIZE	sizeof(StartupInfo) + 5 /* why 5? BJM 2/11/97 */
@@ -88,10 +88,10 @@ typedef struct StartupInfo
    Be sure to use htonl() and ntohl() on the len and msgtype fields! */
 typedef struct PacketBuf
 {
-	int				len;
-	MsgType			msgtype;
-	char			data[MESSAGE_SIZE];
-}				PacketBuf;
+	int			len;
+	MsgType		msgtype;
+	char		data[MESSAGE_SIZE];
+}			PacketBuf;
 
 /* update the conversion routines
   StartupInfo2PacketBuf() and PacketBuf2StartupInfo() (decl. below)
@@ -103,18 +103,17 @@ typedef struct PacketBuf
  */
 typedef struct Port
 {
-	int				sock;		/* file descriptor */
-	int				mask;		/* select mask */
-	int				nBytes;		/* nBytes read in so far */
+	int			sock;			/* file descriptor */
+	int			mask;			/* select mask */
+	int			nBytes;			/* nBytes read in so far */
 	struct sockaddr_in laddr;	/* local addr (us) */
 	struct sockaddr_in raddr;	/* remote addr (them) */
 
 	/*
-	 *	   PacketBufId				id;*//* id of packet buf currently in
-	 * use
-	 */
-	PacketBuf		buf;		/* stream implementation (curr pack buf) */
-}				Port;
+	 * PacketBufId				id;
+	 *//* id of packet buf currently in use */
+	PacketBuf	buf;			/* stream implementation (curr pack buf) */
+}			Port;
 
 /* invalid socket descriptor */
 #define INVALID_SOCK	(-1)
@@ -128,33 +127,33 @@ typedef struct Port
 
 #define DEFAULT_STRING			""
 
-extern FILE    *Pfout,
-			   *Pfin;
-extern int		PQAsyncNotifyWaiting;
+extern FILE *Pfout,
+		   *Pfin;
+extern int	PQAsyncNotifyWaiting;
 
 /* in pqcompriv.c */
-int				pqGetShort(int *, FILE *);
-int				pqGetLong(int *, FILE *);
-int				pqGetNBytes(char *, size_t, FILE *);
-int				pqGetString(char *, size_t, FILE *);
-int				pqGetByte(FILE *);
-
-int				pqPutShort(int, FILE *);
-int				pqPutLong(int, FILE *);
-int				pqPutNBytes(const char *, size_t, FILE *);
-int				pqPutString(const char *, FILE *);
-int				pqPutByte(int, FILE *);
+int			pqGetShort(int *, FILE *);
+int			pqGetLong(int *, FILE *);
+int			pqGetNBytes(char *, size_t, FILE *);
+int			pqGetString(char *, size_t, FILE *);
+int			pqGetByte(FILE *);
+
+int			pqPutShort(int, FILE *);
+int			pqPutLong(int, FILE *);
+int			pqPutNBytes(const char *, size_t, FILE *);
+int			pqPutString(const char *, FILE *);
+int			pqPutByte(int, FILE *);
 
 /*
  * prototypes for functions in pqpacket.c
  */
-extern int		PacketReceive(Port * port, PacketBuf * buf, char nonBlocking);
+extern int	PacketReceive(Port * port, PacketBuf * buf, char nonBlocking);
 extern int
 PacketSend(Port * port, PacketBuf * buf,
 		   PacketLen len, char nonBlocking);
 
 /* extern PacketBuf* StartupInfo2PacketBuf(StartupInfo*); */
 /* extern StartupInfo* PacketBuf2StartupInfo(PacketBuf*); */
-extern char    *name_of_authentication_type(int type);
+extern char *name_of_authentication_type(int type);
 
 #endif							/* PQCOMM_H */
diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h
index 69bdb21df7e..f85025a1592 100644
--- a/src/include/libpq/pqsignal.h
+++ b/src/include/libpq/pqsignal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqsignal.h,v 1.6 1997/09/07 04:58:27 momjian Exp $
+ * $Id: pqsignal.h,v 1.7 1997/09/08 02:37:09 momjian Exp $
  *
  * NOTES
  *	  This shouldn't be in libpq, but the monitor and some other
@@ -17,7 +17,7 @@
 #ifndef PQSIGNAL_H
 #define PQSIGNAL_H
 
-typedef void	(*pqsigfunc) (int);
+typedef void (*pqsigfunc) (int);
 
 extern pqsigfunc pqsignal(int signo, pqsigfunc func);
 
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 3738bd739cd..2e71ab58744 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.12 1997/09/07 04:55:37 momjian Exp $
+ * $Id: miscadmin.h,v 1.13 1997/09/08 02:33:50 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -29,18 +29,18 @@
 /*
  * from postmaster/postmaster.c
  */
-extern int		PostmasterMain(int argc, char *argv[]);
+extern int	PostmasterMain(int argc, char *argv[]);
 
 /*
  * from utils/init/globals.c
  */
-extern int		Portfd;
-extern int		Noversion;
-extern int		MasterPid;
-extern int		Quiet;
-extern char    *DataDir;
+extern int	Portfd;
+extern int	Noversion;
+extern int	MasterPid;
+extern int	Quiet;
+extern char *DataDir;
 
-extern char		OutputFileName[];
+extern char OutputFileName[];
 
 /*
  * done in storage/backendid.h for now.
@@ -48,14 +48,14 @@ extern char		OutputFileName[];
  * extern BackendId    MyBackendId;
  * extern BackendTag   MyBackendTag;
  */
-extern bool		MyDatabaseIdIsInitialized;
-extern Oid		MyDatabaseId;
-extern bool		TransactionInitWasProcessed;
+extern bool MyDatabaseIdIsInitialized;
+extern Oid	MyDatabaseId;
+extern bool TransactionInitWasProcessed;
 
-extern bool		IsUnderPostmaster;
-extern bool		IsPostmaster;
+extern bool IsUnderPostmaster;
+extern bool IsPostmaster;
 
-extern short	DebugLvl;
+extern short DebugLvl;
 
 /* Date/Time Configuration
  *
@@ -79,20 +79,20 @@ extern short	DebugLvl;
 #define USE_ISO_DATES			1
 #define USE_SQL_DATES			2
 
-extern int		DateStyle;
-extern bool		EuroDates;
-extern bool		HasCTZSet;
-extern bool		CDayLight;
-extern int		CTimeZone;
-extern char		CTZName[];
+extern int	DateStyle;
+extern bool EuroDates;
+extern bool HasCTZSet;
+extern bool CDayLight;
+extern int	CTimeZone;
+extern char CTZName[];
 
-extern char		FloatFormat[];
-extern char		DateFormat[];
+extern char FloatFormat[];
+extern char DateFormat[];
 
-extern int		fsyncOff;
-extern int		SortMem;
+extern int	fsyncOff;
+extern int	SortMem;
 
-extern Oid		LastOidProcessed;		/* for query rewrite */
+extern Oid	LastOidProcessed;	/* for query rewrite */
 
 #define MAX_PARSE_BUFFER 8192
 
@@ -108,17 +108,17 @@ extern Oid		LastOidProcessed;		/* for query rewrite */
  *****************************************************************************/
 
 /* now in utils/init/miscinit.c */
-extern char    *GetDatabasePath(void);
-extern char    *GetDatabaseName(void);
-extern void		SetDatabaseName(char *name);
-extern void		SetDatabasePath(char *path);
-extern char    *getpgusername(void);
-extern void		SetPgUserName(void);
-extern Oid		GetUserId(void);
-extern void		SetUserId(void);
-extern int		ValidateBackend(char *path);
-extern int		FindBackend(char *backend, char *argv0);
-extern int		CheckPathAccess(char *path, char *name, int open_mode);
+extern char *GetDatabasePath(void);
+extern char *GetDatabaseName(void);
+extern void SetDatabaseName(char *name);
+extern void SetDatabasePath(char *path);
+extern char *getpgusername(void);
+extern void SetPgUserName(void);
+extern Oid	GetUserId(void);
+extern void SetUserId(void);
+extern int	ValidateBackend(char *path);
+extern int	FindBackend(char *backend, char *argv0);
+extern int	CheckPathAccess(char *path, char *name, int open_mode);
 
 /* lower case version for case-insensitive SQL referenced in pg_proc.h */
 #define GetPgUserName() getpgusername()
@@ -154,7 +154,7 @@ typedef enum ProcessingMode
 	BootstrapProcessing,		/* bootstrap creation of template database */
 	InitProcessing,				/* initializing system */
 	NormalProcessing			/* normal processing */
-}				ProcessingMode;
+}			ProcessingMode;
 
 
 /*****************************************************************************
@@ -166,7 +166,7 @@ typedef enum ProcessingMode
  *		XXX AddExitHandler not defined yet.
  */
 
-typedef int16	ExitStatus;
+typedef int16 ExitStatus;
 
 #define NormalExitStatus		(0)
 #define FatalExitStatus			(127)
@@ -174,20 +174,20 @@ typedef int16	ExitStatus;
 
 /* in utils/init/postinit.c */
 
-extern bool		PostgresIsInitialized;
+extern bool PostgresIsInitialized;
 
-extern void		InitPostgres(char *name);
+extern void InitPostgres(char *name);
 
 /* in miscinit.c */
-extern void		ExitPostgres(ExitStatus status);
-extern void		StatusBackendExit(int status);
-extern void		StatusPostmasterExit(int status);
-
-extern bool		IsNoProcessingMode(void);
-extern bool		IsBootstrapProcessingMode(void);
-extern bool		IsInitProcessingMode(void);
-extern bool		IsNormalProcessingMode(void);
-extern void		SetProcessingMode(ProcessingMode mode);
+extern void ExitPostgres(ExitStatus status);
+extern void StatusBackendExit(int status);
+extern void StatusPostmasterExit(int status);
+
+extern bool IsNoProcessingMode(void);
+extern bool IsBootstrapProcessingMode(void);
+extern bool IsInitProcessingMode(void);
+extern bool IsNormalProcessingMode(void);
+extern void SetProcessingMode(ProcessingMode mode);
 extern ProcessingMode GetProcessingMode(void);
 
 #endif							/* MISCADMIN_H */
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 870bdd80186..f8ad7675a5e 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.9 1997/09/07 04:58:29 momjian Exp $
+ * $Id: execnodes.h,v 1.10 1997/09/08 02:37:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,12 +35,12 @@
  */
 typedef struct IndexInfo
 {
-	NodeTag			type;
-	int				ii_NumKeyAttributes;
-	AttrNumber	   *ii_KeyAttributeNumbers;
+	NodeTag		type;
+	int			ii_NumKeyAttributes;
+	AttrNumber *ii_KeyAttributeNumbers;
 	FuncIndexInfoPtr ii_FuncIndexInfo;
-	Node		   *ii_Predicate;
-}				IndexInfo;
+	Node	   *ii_Predicate;
+}			IndexInfo;
 
 /* ----------------
  *	  RelationInfo information
@@ -59,13 +59,13 @@ typedef struct IndexInfo
  */
 typedef struct RelationInfo
 {
-	NodeTag			type;
-	Index			ri_RangeTableIndex;
-	Relation		ri_RelationDesc;
-	int				ri_NumIndices;
-	RelationPtr		ri_IndexRelationDescs;
-	IndexInfo	  **ri_IndexRelationInfo;
-}				RelationInfo;
+	NodeTag		type;
+	Index		ri_RangeTableIndex;
+	Relation	ri_RelationDesc;
+	int			ri_NumIndices;
+	RelationPtr ri_IndexRelationDescs;
+	IndexInfo **ri_IndexRelationInfo;
+}			RelationInfo;
 
 /* ----------------
  *	  ExprContext
@@ -80,17 +80,17 @@ typedef struct RelationInfo
  */
 typedef struct ExprContext
 {
-	NodeTag			type;
+	NodeTag		type;
 	TupleTableSlot *ecxt_scantuple;
 	TupleTableSlot *ecxt_innertuple;
 	TupleTableSlot *ecxt_outertuple;
-	Relation		ecxt_relation;
-	Index			ecxt_relid;
-	ParamListInfo	ecxt_param_list_info;
-	List		   *ecxt_range_table;
-	Datum		   *ecxt_values;/* precomputed values for aggreg */
-	char		   *ecxt_nulls; /* null flags for aggreg  values */
-}				ExprContext;
+	Relation	ecxt_relation;
+	Index		ecxt_relid;
+	ParamListInfo ecxt_param_list_info;
+	List	   *ecxt_range_table;
+	Datum	   *ecxt_values;	/* precomputed values for aggreg */
+	char	   *ecxt_nulls;		/* null flags for aggreg  values */
+}			ExprContext;
 
 /* ----------------
  *		ProjectionInfo node information
@@ -110,13 +110,13 @@ typedef struct ExprContext
  */
 typedef struct ProjectionInfo
 {
-	NodeTag			type;
-	List		   *pi_targetlist;
-	int				pi_len;
-	Datum		   *pi_tupValue;
-	ExprContext    *pi_exprContext;
+	NodeTag		type;
+	List	   *pi_targetlist;
+	int			pi_len;
+	Datum	   *pi_tupValue;
+	ExprContext *pi_exprContext;
 	TupleTableSlot *pi_slot;
-}				ProjectionInfo;
+}			ProjectionInfo;
 
 /* ----------------
  *	  JunkFilter
@@ -149,15 +149,15 @@ typedef struct ProjectionInfo
  */
 typedef struct JunkFilter
 {
-	NodeTag			type;
-	List		   *jf_targetList;
-	int				jf_length;
-	TupleDesc		jf_tupType;
-	List		   *jf_cleanTargetList;
-	int				jf_cleanLength;
-	TupleDesc		jf_cleanTupType;
-	AttrNumber	   *jf_cleanMap;
-}				JunkFilter;
+	NodeTag		type;
+	List	   *jf_targetList;
+	int			jf_length;
+	TupleDesc	jf_tupType;
+	List	   *jf_cleanTargetList;
+	int			jf_cleanLength;
+	TupleDesc	jf_cleanTupType;
+	AttrNumber *jf_cleanMap;
+}			JunkFilter;
 
 /* ----------------
  *	  EState information
@@ -193,19 +193,19 @@ typedef struct JunkFilter
  */
 typedef struct EState
 {
-	NodeTag			type;
-	ScanDirection	es_direction;
-	List		   *es_range_table;
-	RelationInfo   *es_result_relation_info;
-	Relation		es_into_relation_descriptor;
-	ParamListInfo	es_param_list_info;
-	int				es_BaseId;
-	TupleTable		es_tupleTable;
-	JunkFilter	   *es_junkFilter;
-	int			   *es_refcount;
-	uint32			es_processed;		/* # of tuples processed */
-	Oid				es_lastoid; /* last oid processed (by INSERT) */
-}				EState;
+	NodeTag		type;
+	ScanDirection es_direction;
+	List	   *es_range_table;
+	RelationInfo *es_result_relation_info;
+	Relation	es_into_relation_descriptor;
+	ParamListInfo es_param_list_info;
+	int			es_BaseId;
+	TupleTable	es_tupleTable;
+	JunkFilter *es_junkFilter;
+	int		   *es_refcount;
+	uint32		es_processed;	/* # of tuples processed */
+	Oid			es_lastoid;		/* last oid processed (by INSERT) */
+}			EState;
 
 /* ----------------
  *		Executor Type information needed by plannodes.h
@@ -258,14 +258,14 @@ typedef struct EState
  */
 typedef struct CommonState
 {
-	NodeTag			type;		/* its first field is NodeTag */
-	int				cs_base_id;
+	NodeTag		type;			/* its first field is NodeTag */
+	int			cs_base_id;
 	TupleTableSlot *cs_OuterTupleSlot;
 	TupleTableSlot *cs_ResultTupleSlot;
-	ExprContext    *cs_ExprContext;
+	ExprContext *cs_ExprContext;
 	ProjectionInfo *cs_ProjInfo;
-	bool			cs_TupFromTlist;
-}				CommonState;
+	bool		cs_TupFromTlist;
+}			CommonState;
 
 
 /* ----------------------------------------------------------------
@@ -291,9 +291,9 @@ typedef struct CommonState
  */
 typedef struct ResultState
 {
-	CommonState		cstate;		/* its first field is NodeTag */
-	int				rs_done;
-}				ResultState;
+	CommonState cstate;			/* its first field is NodeTag */
+	int			rs_done;
+}			ResultState;
 
 /* ----------------
  *	 AppendState information
@@ -321,14 +321,14 @@ typedef struct ResultState
  */
 typedef struct AppendState
 {
-	CommonState		cstate;		/* its first field is NodeTag */
-	int				as_whichplan;
-	int				as_nplans;
-	bool		   *as_initialized;
-	List		   *as_rtentries;
-	List		   *as_result_relation_info_list;
-	List		   *as_junkFilter_list;
-}				AppendState;
+	CommonState cstate;			/* its first field is NodeTag */
+	int			as_whichplan;
+	int			as_nplans;
+	bool	   *as_initialized;
+	List	   *as_rtentries;
+	List	   *as_result_relation_info_list;
+	List	   *as_junkFilter_list;
+}			AppendState;
 
 /* ----------------------------------------------------------------
  *				 Scan State Information
@@ -358,11 +358,11 @@ typedef struct AppendState
  */
 typedef struct CommonScanState
 {
-	CommonState		cstate;		/* its first field is NodeTag */
-	Relation		css_currentRelation;
-	HeapScanDesc	css_currentScanDesc;
+	CommonState cstate;			/* its first field is NodeTag */
+	Relation	css_currentRelation;
+	HeapScanDesc css_currentScanDesc;
 	TupleTableSlot *css_ScanTupleSlot;
-}				CommonScanState;
+}			CommonScanState;
 
 /* ----------------
  *	 IndexScanState information
@@ -392,15 +392,15 @@ typedef struct CommonScanState
  */
 typedef struct IndexScanState
 {
-	CommonState		cstate;		/* its first field is NodeTag */
-	int				iss_NumIndices;
-	int				iss_IndexPtr;
-	ScanKey		   *iss_ScanKeys;
-	int			   *iss_NumScanKeys;
-	Pointer			iss_RuntimeKeyInfo;
-	RelationPtr		iss_RelationDescs;
+	CommonState cstate;			/* its first field is NodeTag */
+	int			iss_NumIndices;
+	int			iss_IndexPtr;
+	ScanKey    *iss_ScanKeys;
+	int		   *iss_NumScanKeys;
+	Pointer		iss_RuntimeKeyInfo;
+	RelationPtr iss_RelationDescs;
 	IndexScanDescPtr iss_ScanDescs;
-}				IndexScanState;
+}			IndexScanState;
 
 
 /* ----------------------------------------------------------------
@@ -442,9 +442,9 @@ typedef CommonState JoinState;
  */
 typedef struct NestLoopState
 {
-	JoinState		jstate;		/* its first field is NodeTag */
-	bool			nl_PortalFlag;
-}				NestLoopState;
+	JoinState	jstate;			/* its first field is NodeTag */
+	bool		nl_PortalFlag;
+}			NestLoopState;
 
 /* ----------------
  *	 MergeJoinState information
@@ -468,12 +468,12 @@ typedef struct NestLoopState
  */
 typedef struct MergeJoinState
 {
-	JoinState		jstate;		/* its first field is NodeTag */
-	List		   *mj_OSortopI;
-	List		   *mj_ISortopO;
-	int				mj_JoinState;
+	JoinState	jstate;			/* its first field is NodeTag */
+	List	   *mj_OSortopI;
+	List	   *mj_ISortopO;
+	int			mj_JoinState;
 	TupleTableSlot *mj_MarkedTupleSlot;
-}				MergeJoinState;
+}			MergeJoinState;
 
 /* ----------------
  *	 HashJoinState information
@@ -510,20 +510,20 @@ typedef struct MergeJoinState
  */
 typedef struct HashJoinState
 {
-	JoinState		jstate;		/* its first field is NodeTag */
-	HashJoinTable	hj_HashTable;
-	IpcMemoryId		hj_HashTableShmId;
-	HashBucket		hj_CurBucket;
-	HeapTuple		hj_CurTuple;
-	OverflowTuple	hj_CurOTuple;
-	Var			   *hj_InnerHashKey;
-	File		   *hj_OuterBatches;
-	File		   *hj_InnerBatches;
-	char		   *hj_OuterReadPos;
-	int				hj_OuterReadBlk;
+	JoinState	jstate;			/* its first field is NodeTag */
+	HashJoinTable hj_HashTable;
+	IpcMemoryId hj_HashTableShmId;
+	HashBucket	hj_CurBucket;
+	HeapTuple	hj_CurTuple;
+	OverflowTuple hj_CurOTuple;
+	Var		   *hj_InnerHashKey;
+	File	   *hj_OuterBatches;
+	File	   *hj_InnerBatches;
+	char	   *hj_OuterReadPos;
+	int			hj_OuterReadBlk;
 	TupleTableSlot *hj_OuterTupleSlot;
 	TupleTableSlot *hj_HashTupleSlot;
-}				HashJoinState;
+}			HashJoinState;
 
 
 /* ----------------------------------------------------------------
@@ -560,9 +560,9 @@ typedef struct HashJoinState
 typedef struct MaterialState
 {
 	CommonScanState csstate;	/* its first field is NodeTag */
-	bool			mat_Flag;
-	Relation		mat_TempRelation;
-}				MaterialState;
+	bool		mat_Flag;
+	Relation	mat_TempRelation;
+}			MaterialState;
 
 /* ---------------------
  *	AggregateState information
@@ -573,8 +573,8 @@ typedef struct MaterialState
 typedef struct AggState
 {
 	CommonScanState csstate;	/* its first field is NodeTag */
-	bool			agg_done;
-}				AggState;
+	bool		agg_done;
+}			AggState;
 
 /* ---------------------
  *	GroupState information
@@ -584,10 +584,10 @@ typedef struct AggState
 typedef struct GroupState
 {
 	CommonScanState csstate;	/* its first field is NodeTag */
-	bool			grp_useLastTuple;	/* last tuple not processed yet */
-	bool			grp_done;
+	bool		grp_useLastTuple;		/* last tuple not processed yet */
+	bool		grp_done;
 	TupleTableSlot *grp_lastSlot;
-}				GroupState;
+}			GroupState;
 
 /* ----------------
  *	 SortState information
@@ -623,10 +623,10 @@ typedef struct GroupState
 typedef struct SortState
 {
 	CommonScanState csstate;	/* its first field is NodeTag */
-	bool			sort_Flag;
-	ScanKey			sort_Keys;
-	bool			cleaned;
-}				SortState;
+	bool		sort_Flag;
+	ScanKey		sort_Keys;
+	bool		cleaned;
+}			SortState;
 
 /* ----------------
  *	 UniqueState information
@@ -668,9 +668,9 @@ typedef CommonState UniqueState;
  */
 typedef struct HashState
 {
-	CommonState		cstate;		/* its first field is NodeTag */
-	File		   *hashBatches;
-}				HashState;
+	CommonState cstate;			/* its first field is NodeTag */
+	File	   *hashBatches;
+}			HashState;
 
 /* -----------------------
  *	TeeState information
@@ -688,15 +688,15 @@ typedef struct HashState
 */
 typedef struct TeeState
 {
-	CommonState		cstate;		/* its first field is NodeTag */
-	int				tee_leftPlace;
-	int				tee_rightPlace;
-	int				tee_lastPlace;
-	char		   *tee_bufferRelname;
-	Relation		tee_bufferRel;
-	MemoryContext	tee_mcxt;
-	HeapScanDesc	tee_leftScanDesc;
-	HeapScanDesc	tee_rightScanDesc;
-}				TeeState;
+	CommonState cstate;			/* its first field is NodeTag */
+	int			tee_leftPlace;
+	int			tee_rightPlace;
+	int			tee_lastPlace;
+	char	   *tee_bufferRelname;
+	Relation	tee_bufferRel;
+	MemoryContext tee_mcxt;
+	HeapScanDesc tee_leftScanDesc;
+	HeapScanDesc tee_rightScanDesc;
+}			TeeState;
 
 #endif							/* EXECNODES_H */
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 04b2c10c442..57583f6773b 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: makefuncs.h,v 1.4 1997/09/07 04:58:32 momjian Exp $
+ * $Id: makefuncs.h,v 1.5 1997/09/08 02:37:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,21 +16,21 @@
 #include <nodes/primnodes.h>
 #include <utils/fcache.h>
 
-extern Oper    *
+extern Oper *
 makeOper(Oid opno,
 		 Oid opid,
 		 Oid opresulttype,
 		 int opsize,
 		 FunctionCachePtr op_fcache);
 
-extern Var	   *
+extern Var *
 makeVar(Index varno,
 		AttrNumber varattno,
 		Oid vartype,
 		Index varnoold,
 		AttrNumber varoattno);
 
-extern Resdom  *
+extern Resdom *
 makeResdom(AttrNumber resno,
 		   Oid restype,
 		   int reslen,
@@ -39,7 +39,7 @@ makeResdom(AttrNumber resno,
 		   Oid reskeyop,
 		   int resjunk);
 
-extern Const   *
+extern Const *
 makeConst(Oid consttype,
 		  Size constlen,
 		  Datum constvalue,
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index 1d5bced1f3c..aa1050af16c 100644
--- a/src/include/nodes/memnodes.h
+++ b/src/include/nodes/memnodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memnodes.h,v 1.5 1997/09/07 04:58:35 momjian Exp $
+ * $Id: memnodes.h,v 1.6 1997/09/08 02:37:19 momjian Exp $
  *
  * XXX the typedefs in this file are different from the other ???nodes.h;
  *	  they are pointers to structures instead of the structures themselves.
@@ -49,46 +49,46 @@
 typedef struct MemoryContextMethodsData
 {
 	Pointer(*alloc) ();
-	void			(*free_p) ();		/* need to use free as a #define,
-										 * so can't use free */
-					Pointer(*realloc) ();
-	char		   *(*getName) ();
-	void			(*dump) ();
-}			   *MemoryContextMethods;
+	void		(*free_p) ();	/* need to use free as a #define, so can't
+								 * use free */
+				Pointer(*realloc) ();
+	char	   *(*getName) ();
+	void		(*dump) ();
+}		   *MemoryContextMethods;
 
 typedef struct MemoryContext
 {
-	NodeTag			type;
+	NodeTag		type;
 	MemoryContextMethods method;
-}			   *MemoryContext;
+}		   *MemoryContext;
 
 /* think about doing this right some time but we'll have explicit fields
    for now -ay 10/94 */
 typedef struct GlobalMemory
 {
-	NodeTag			type;
+	NodeTag		type;
 	MemoryContextMethods method;
-	AllocSetData	setData;
-	char		   *name;
+	AllocSetData setData;
+	char	   *name;
 	OrderedElemData elemData;
-}			   *GlobalMemory;
+}		   *GlobalMemory;
 
 typedef MemoryContext *PortalMemoryContext;
 
 typedef struct PortalVariableMemory
 {
-	NodeTag			type;
+	NodeTag		type;
 	MemoryContextMethods method;
-	AllocSetData	setData;
-}			   *PortalVariableMemory;
+	AllocSetData setData;
+}		   *PortalVariableMemory;
 
 typedef struct PortalHeapMemory
 {
-	NodeTag			type;
+	NodeTag		type;
 	MemoryContextMethods method;
-	Pointer			block;
-	FixedStackData	stackData;
-}			   *PortalHeapMemory;
+	Pointer		block;
+	FixedStackData stackData;
+}		   *PortalHeapMemory;
 
 /*
  * MemoryContextIsValid --
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index 3edc598a833..b1fe7469610 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -6,17 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeFuncs.h,v 1.3 1997/09/07 04:58:37 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.4 1997/09/08 02:37:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEFUNCS_H
 #define NODEFUNCS_H
 
-extern bool		single_node(Node * node);
-extern bool		var_is_outer(Var * var);
-extern bool		var_is_rel(Var * var);
-extern Oper    *replace_opid(Oper * oper);
-extern bool		non_null(Expr * c);
+extern bool single_node(Node * node);
+extern bool var_is_outer(Var * var);
+extern bool var_is_rel(Var * var);
+extern Oper *replace_opid(Oper * oper);
+extern bool non_null(Expr * c);
 
 #endif							/* NODEFUNCS_H */
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 944ed7453f2..73c7b84cba9 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.12 1997/09/07 04:58:39 momjian Exp $
+ * $Id: nodes.h,v 1.13 1997/09/08 02:37:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -209,7 +209,7 @@ typedef enum NodeTag
 	T_SortClause,
 	T_GroupClause,
 	T_SubSelect
-}				NodeTag;
+}			NodeTag;
 
 /*
  * The first field of a node of any type is gauranteed to be the NodeTag.
@@ -219,8 +219,8 @@ typedef enum NodeTag
  */
 typedef struct Node
 {
-	NodeTag			type;
-}				Node;
+	NodeTag		type;
+}			Node;
 
 #define nodeTag(_node_)			((Node*)_node_)->type
 
@@ -253,30 +253,30 @@ typedef struct Node
 /*
  * nodes/nodes.c
  */
-extern Node    *newNode(Size size, NodeTag tag);
+extern Node *newNode(Size size, NodeTag tag);
 
 /*
  * nodes/{outfuncs.c,print.c}
  */
 #define nodeDisplay		pprint
 
-extern char    *nodeToString(void *obj);
-extern void		print(void *obj);
+extern char *nodeToString(void *obj);
+extern void print(void *obj);
 
 /*
  * nodes/{readfuncs.c,read.c}
  */
-extern void    *stringToNode(char *str);
+extern void *stringToNode(char *str);
 
 /*
  * nodes/copyfuncs.c
  */
-extern void    *copyObject(void *obj);
+extern void *copyObject(void *obj);
 
 /*
  * nodes/equalfuncs.c
  */
-extern bool		equal(void *a, void *b);
+extern bool equal(void *a, void *b);
 
 
 /* ----------------
@@ -284,7 +284,7 @@ extern bool		equal(void *a, void *b);
  *		-cim 6/3/90
  * ----------------
  */
-typedef float	Cost;
+typedef float Cost;
 
 /*
  * CmdType -
@@ -303,7 +303,7 @@ typedef enum CmdType
 	CMD_NOTIFY,
 	CMD_UTILITY					/* cmds like create, destroy, copy,
 								 * vacuum, etc. */
-}				CmdType;
+}			CmdType;
 
 
 #endif							/* NODES_H */
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index 78f0d1cd64b..d3e8bd86e8a 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: params.h,v 1.4 1997/09/07 04:58:40 momjian Exp $
+ * $Id: params.h,v 1.5 1997/09/08 02:37:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,15 +75,15 @@
 
 typedef struct ParamListInfoData
 {
-	int				kind;
-	char		   *name;
-	AttrNumber		id;
-	Oid				type;
-	Size			length;
-	bool			isnull;
-	bool			byval;
-	Datum			value;
-}				ParamListInfoData;
+	int			kind;
+	char	   *name;
+	AttrNumber	id;
+	Oid			type;
+	Size		length;
+	bool		isnull;
+	bool		byval;
+	Datum		value;
+}			ParamListInfoData;
 
 typedef ParamListInfoData *ParamListInfo;
 
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index c24d27918c2..aa311129159 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.24 1997/09/07 04:58:44 momjian Exp $
+ * $Id: parsenodes.h,v 1.25 1997/09/08 02:37:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,39 +33,38 @@
  */
 typedef struct Query
 {
-	NodeTag			type;
+	NodeTag		type;
 
-	CmdType			commandType;/* select|insert|update|delete|utility */
+	CmdType		commandType;	/* select|insert|update|delete|utility */
 
-	Node		   *utilityStmt;/* non-null if this is a non-optimizable
+	Node	   *utilityStmt;	/* non-null if this is a non-optimizable
 								 * statement */
 
-	int				resultRelation;		/* target relation (index to
-										 * rtable) */
-	char		   *into;		/* portal (cursor) name */
-	bool			isPortal;	/* is this a retrieve into portal? */
-	bool			isBinary;	/* binary portal? */
+	int			resultRelation; /* target relation (index to rtable) */
+	char	   *into;			/* portal (cursor) name */
+	bool		isPortal;		/* is this a retrieve into portal? */
+	bool		isBinary;		/* binary portal? */
 
-	char		   *uniqueFlag; /* NULL, '*', or Unique attribute name */
-	List		   *sortClause; /* a list of SortClause's */
+	char	   *uniqueFlag;		/* NULL, '*', or Unique attribute name */
+	List	   *sortClause;		/* a list of SortClause's */
 
-	List		   *rtable;		/* list of range table entries */
-	List		   *targetList; /* target list (of TargetEntry) */
-	Node		   *qual;		/* qualifications */
+	List	   *rtable;			/* list of range table entries */
+	List	   *targetList;		/* target list (of TargetEntry) */
+	Node	   *qual;			/* qualifications */
 
-	List		   *groupClause;/* list of columns to specified in GROUP
+	List	   *groupClause;	/* list of columns to specified in GROUP
 								 * BY */
-	Node		   *havingQual; /* qualification of each group */
+	Node	   *havingQual;		/* qualification of each group */
 
-	int				qry_numAgg; /* number of aggregates in the target list */
-	Aggreg		  **qry_aggs;	/* the aggregates */
+	int			qry_numAgg;		/* number of aggregates in the target list */
+	Aggreg	  **qry_aggs;		/* the aggregates */
 
 	/* internal to planner */
-	List		   *base_relation_list_;		/* base relation list */
-	List		   *join_relation_list_;		/* list of relations
-												 * generated by joins */
-	bool			query_is_archival_; /* archival query flag */
-}				Query;
+	List	   *base_relation_list_;	/* base relation list */
+	List	   *join_relation_list_;	/* list of relations generated by
+										 * joins */
+	bool		query_is_archival_;		/* archival query flag */
+}			Query;
 
 
 /*****************************************************************************
@@ -83,11 +82,11 @@ typedef struct Query
  */
 typedef struct AddAttrStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* the relation to add attr */
-	bool			inh;		/* add recursively to children? */
+	NodeTag		type;
+	char	   *relname;		/* the relation to add attr */
+	bool		inh;			/* add recursively to children? */
 	struct ColumnDef *colDef;	/* the attribute definition */
-}				AddAttrStmt;
+}			AddAttrStmt;
 
 /* ----------------------
  *		Change ACL Statement
@@ -95,11 +94,11 @@ typedef struct AddAttrStmt
  */
 typedef struct ChangeACLStmt
 {
-	NodeTag			type;
+	NodeTag		type;
 	struct AclItem *aclitem;
-	unsigned		modechg;
-	List		   *relNames;
-}				ChangeACLStmt;
+	unsigned	modechg;
+	List	   *relNames;
+}			ChangeACLStmt;
 
 /* ----------------------
  *		Close Portal Statement
@@ -107,9 +106,9 @@ typedef struct ChangeACLStmt
  */
 typedef struct ClosePortalStmt
 {
-	NodeTag			type;
-	char		   *portalname; /* name of the portal (cursor) */
-}				ClosePortalStmt;
+	NodeTag		type;
+	char	   *portalname;		/* name of the portal (cursor) */
+}			ClosePortalStmt;
 
 /* ----------------------
  *		Copy Statement
@@ -117,14 +116,14 @@ typedef struct ClosePortalStmt
  */
 typedef struct CopyStmt
 {
-	NodeTag			type;
-	bool			binary;		/* is a binary copy? */
-	char		   *relname;	/* the relation to copy */
-	bool			oids;		/* copy oid's? */
-	int				direction;	/* TO or FROM */
-	char		   *filename;	/* if NULL, use stdin/stdout */
-	char		   *delimiter;	/* delimiter character, \t by default */
-}				CopyStmt;
+	NodeTag		type;
+	bool		binary;			/* is a binary copy? */
+	char	   *relname;		/* the relation to copy */
+	bool		oids;			/* copy oid's? */
+	int			direction;		/* TO or FROM */
+	char	   *filename;		/* if NULL, use stdin/stdout */
+	char	   *delimiter;		/* delimiter character, \t by default */
+}			CopyStmt;
 
 /* ----------------------
  *		Create Table Statement
@@ -133,32 +132,32 @@ typedef struct CopyStmt
 typedef enum ArchType
 {
 	ARCH_NONE, ARCH_LIGHT, ARCH_HEAVY	/* archive mode */
-}				ArchType;
+}			ArchType;
 
 typedef struct CreateStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* the relation to create */
-	List		   *tableElts;	/* column definitions list of ColumnDef */
-	List		   *inhRelnames;/* relations to inherit from list of Value
+	NodeTag		type;
+	char	   *relname;		/* the relation to create */
+	List	   *tableElts;		/* column definitions list of ColumnDef */
+	List	   *inhRelnames;	/* relations to inherit from list of Value
 								 * (string) */
-	ArchType		archiveType;/* archive mode (ARCH_NONE if none */
-	int				location;	/* smgrid (-1 if none) */
-	int				archiveLoc; /* smgrid (-1 if none) */
-	List		   *constraints;/* list of constraints (ConstaintDef) */
-}				CreateStmt;
+	ArchType	archiveType;	/* archive mode (ARCH_NONE if none */
+	int			location;		/* smgrid (-1 if none) */
+	int			archiveLoc;		/* smgrid (-1 if none) */
+	List	   *constraints;	/* list of constraints (ConstaintDef) */
+}			CreateStmt;
 
 typedef enum ConstrType
 {
 	CONSTR_NONE, CONSTR_CHECK	/* type of constaints */
-}				ConstrType;
+}			ConstrType;
 
 typedef struct ConstraintDef
 {
-	ConstrType		type;
-	char		   *name;		/* name */
-	void		   *def;		/* definition */
-}				ConstraintDef;
+	ConstrType	type;
+	char	   *name;			/* name */
+	void	   *def;			/* definition */
+}			ConstraintDef;
 
 /* ----------------------
  *		Create/Drop TRIGGER Statements
@@ -167,26 +166,26 @@ typedef struct ConstraintDef
 
 typedef struct CreateTrigStmt
 {
-	NodeTag			type;
-	char		   *trigname;	/* TRIGGER' name */
-	char		   *relname;	/* triggered relation */
-	char		   *funcname;	/* function to call (or NULL) */
-	List		   *args;		/* list of (T_String) Values or NULL */
-	bool			before;		/* BEFORE/AFTER */
-	bool			row;		/* ROW/STATEMENT */
-	char			actions[4]; /* Insert, Update, Delete */
-	char		   *lang;		/* NULL (which means Clanguage) */
-	char		   *text;		/* AS 'text' */
-	List		   *attr;		/* UPDATE OF a, b,... (NI) or NULL */
-	char		   *when;		/* WHEN 'a > 10 ...' (NI) or NULL */
-}				CreateTrigStmt;
+	NodeTag		type;
+	char	   *trigname;		/* TRIGGER' name */
+	char	   *relname;		/* triggered relation */
+	char	   *funcname;		/* function to call (or NULL) */
+	List	   *args;			/* list of (T_String) Values or NULL */
+	bool		before;			/* BEFORE/AFTER */
+	bool		row;			/* ROW/STATEMENT */
+	char		actions[4];		/* Insert, Update, Delete */
+	char	   *lang;			/* NULL (which means Clanguage) */
+	char	   *text;			/* AS 'text' */
+	List	   *attr;			/* UPDATE OF a, b,... (NI) or NULL */
+	char	   *when;			/* WHEN 'a > 10 ...' (NI) or NULL */
+}			CreateTrigStmt;
 
 typedef struct DropTrigStmt
 {
-	NodeTag			type;
-	char		   *trigname;	/* TRIGGER' name */
-	char		   *relname;	/* triggered relation */
-}				DropTrigStmt;
+	NodeTag		type;
+	char	   *trigname;		/* TRIGGER' name */
+	char	   *relname;		/* triggered relation */
+}			DropTrigStmt;
 
 /* ----------------------
  *		Create SEQUENCE Statement
@@ -195,10 +194,10 @@ typedef struct DropTrigStmt
 
 typedef struct CreateSeqStmt
 {
-	NodeTag			type;
-	char		   *seqname;	/* the relation to create */
-	List		   *options;
-}				CreateSeqStmt;
+	NodeTag		type;
+	char	   *seqname;		/* the relation to create */
+	List	   *options;
+}			CreateSeqStmt;
 
 /* ----------------------
  *		Create Version Statement
@@ -206,12 +205,12 @@ typedef struct CreateSeqStmt
  */
 typedef struct VersionStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* the new relation */
-	int				direction;	/* FORWARD | BACKWARD */
-	char		   *fromRelname;/* relation to create a version */
-	char		   *date;		/* date of the snapshot */
-}				VersionStmt;
+	NodeTag		type;
+	char	   *relname;		/* the new relation */
+	int			direction;		/* FORWARD | BACKWARD */
+	char	   *fromRelname;	/* relation to create a version */
+	char	   *date;			/* date of the snapshot */
+}			VersionStmt;
 
 /* ----------------------
  *		Create {Operator|Type|Aggregate} Statement
@@ -219,11 +218,11 @@ typedef struct VersionStmt
  */
 typedef struct DefineStmt
 {
-	NodeTag			type;
-	int				defType;	/* OPERATOR|P_TYPE|AGGREGATE */
-	char		   *defname;
-	List		   *definition; /* a list of DefElem */
-}				DefineStmt;
+	NodeTag		type;
+	int			defType;		/* OPERATOR|P_TYPE|AGGREGATE */
+	char	   *defname;
+	List	   *definition;		/* a list of DefElem */
+}			DefineStmt;
 
 /* ----------------------
  *		Drop Table Statement
@@ -231,10 +230,10 @@ typedef struct DefineStmt
  */
 typedef struct DestroyStmt
 {
-	NodeTag			type;
-	List		   *relNames;	/* relations to be dropped */
-	bool			sequence;
-}				DestroyStmt;
+	NodeTag		type;
+	List	   *relNames;		/* relations to be dropped */
+	bool		sequence;
+}			DestroyStmt;
 
 /* ----------------------
  *		Extend Index Statement
@@ -242,12 +241,12 @@ typedef struct DestroyStmt
  */
 typedef struct ExtendStmt
 {
-	NodeTag			type;
-	char		   *idxname;	/* name of the index */
-	Node		   *whereClause;/* qualifications */
-	List		   *rangetable; /* range table, filled in by
+	NodeTag		type;
+	char	   *idxname;		/* name of the index */
+	Node	   *whereClause;	/* qualifications */
+	List	   *rangetable;		/* range table, filled in by
 								 * transformStmt() */
-}				ExtendStmt;
+}			ExtendStmt;
 
 /* ----------------------
  *		Begin Recipe Statement
@@ -255,9 +254,9 @@ typedef struct ExtendStmt
  */
 typedef struct RecipeStmt
 {
-	NodeTag			type;
-	char		   *recipeName; /* name of the recipe */
-}				RecipeStmt;
+	NodeTag		type;
+	char	   *recipeName;		/* name of the recipe */
+}			RecipeStmt;
 
 /* ----------------------
  *		Fetch Statement
@@ -265,11 +264,11 @@ typedef struct RecipeStmt
  */
 typedef struct FetchStmt
 {
-	NodeTag			type;
-	int				direction;	/* FORWARD or BACKWARD */
-	int				howMany;	/* amount to fetch ("ALL" --> 0) */
-	char		   *portalname; /* name of portal (cursor) */
-}				FetchStmt;
+	NodeTag		type;
+	int			direction;		/* FORWARD or BACKWARD */
+	int			howMany;		/* amount to fetch ("ALL" --> 0) */
+	char	   *portalname;		/* name of portal (cursor) */
+}			FetchStmt;
 
 /* ----------------------
  *		Create Index Statement
@@ -277,19 +276,18 @@ typedef struct FetchStmt
  */
 typedef struct IndexStmt
 {
-	NodeTag			type;
-	char		   *idxname;	/* name of the index */
-	char		   *relname;	/* name of relation to index on */
-	char		   *accessMethod;		/* name of acess methood (eg.
-										 * btree) */
-	List		   *indexParams;/* a list of IndexElem */
-	List		   *withClause; /* a list of ParamString */
-	Node		   *whereClause;/* qualifications */
-	List		   *rangetable; /* range table, filled in by
+	NodeTag		type;
+	char	   *idxname;		/* name of the index */
+	char	   *relname;		/* name of relation to index on */
+	char	   *accessMethod;	/* name of acess methood (eg. btree) */
+	List	   *indexParams;	/* a list of IndexElem */
+	List	   *withClause;		/* a list of ParamString */
+	Node	   *whereClause;	/* qualifications */
+	List	   *rangetable;		/* range table, filled in by
 								 * transformStmt() */
-	bool		   *lossy;		/* is index lossy? */
-	bool			unique;		/* is index unique? */
-}				IndexStmt;
+	bool	   *lossy;			/* is index lossy? */
+	bool		unique;			/* is index unique? */
+}			IndexStmt;
 
 /* ----------------------
  *		Move Statement (Not implemented)
@@ -297,12 +295,12 @@ typedef struct IndexStmt
  */
 typedef struct MoveStmt
 {
-	NodeTag			type;
-	int				direction;	/* FORWARD or BACKWARD */
-	bool			to;
-	int				where;
-	char		   *portalname;
-}				MoveStmt;
+	NodeTag		type;
+	int			direction;		/* FORWARD or BACKWARD */
+	bool		to;
+	int			where;
+	char	   *portalname;
+}			MoveStmt;
 
 /* ----------------------
  *		Create Function Statement
@@ -310,16 +308,16 @@ typedef struct MoveStmt
  */
 typedef struct ProcedureStmt
 {
-	NodeTag			type;
-	char		   *funcname;	/* name of function to create */
-	List		   *defArgs;	/* list of definitions a list of strings
+	NodeTag		type;
+	char	   *funcname;		/* name of function to create */
+	List	   *defArgs;		/* list of definitions a list of strings
 								 * (as Value *) */
-	Node		   *returnType; /* the return type (as a string or a
+	Node	   *returnType;		/* the return type (as a string or a
 								 * TypeName (ie.setof) */
-	List		   *withClause; /* a list of ParamString */
-	char		   *as;			/* the SQL statement or filename */
-	char		   *language;	/* C or SQL */
-}				ProcedureStmt;
+	List	   *withClause;		/* a list of ParamString */
+	char	   *as;				/* the SQL statement or filename */
+	char	   *language;		/* C or SQL */
+}			ProcedureStmt;
 
 /* ----------------------
  *		Purge Statement
@@ -327,11 +325,11 @@ typedef struct ProcedureStmt
  */
 typedef struct PurgeStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* relation to purge */
-	char		   *beforeDate; /* purge before this date */
-	char		   *afterDate;	/* purge after this date */
-}				PurgeStmt;
+	NodeTag		type;
+	char	   *relname;		/* relation to purge */
+	char	   *beforeDate;		/* purge before this date */
+	char	   *afterDate;		/* purge after this date */
+}			PurgeStmt;
 
 /* ----------------------
  *		Drop Aggregate Statement
@@ -339,10 +337,10 @@ typedef struct PurgeStmt
  */
 typedef struct RemoveAggrStmt
 {
-	NodeTag			type;
-	char		   *aggname;	/* aggregate to drop */
-	char		   *aggtype;	/* for this type */
-}				RemoveAggrStmt;
+	NodeTag		type;
+	char	   *aggname;		/* aggregate to drop */
+	char	   *aggtype;		/* for this type */
+}			RemoveAggrStmt;
 
 /* ----------------------
  *		Drop Function Statement
@@ -350,10 +348,10 @@ typedef struct RemoveAggrStmt
  */
 typedef struct RemoveFuncStmt
 {
-	NodeTag			type;
-	char		   *funcname;	/* function to drop */
-	List		   *args;		/* types of the arguments */
-}				RemoveFuncStmt;
+	NodeTag		type;
+	char	   *funcname;		/* function to drop */
+	List	   *args;			/* types of the arguments */
+}			RemoveFuncStmt;
 
 /* ----------------------
  *		Drop Operator Statement
@@ -361,10 +359,10 @@ typedef struct RemoveFuncStmt
  */
 typedef struct RemoveOperStmt
 {
-	NodeTag			type;
-	char		   *opname;		/* operator to drop */
-	List		   *args;		/* types of the arguments */
-}				RemoveOperStmt;
+	NodeTag		type;
+	char	   *opname;			/* operator to drop */
+	List	   *args;			/* types of the arguments */
+}			RemoveOperStmt;
 
 /* ----------------------
  *		Drop {Type|Index|Rule|View} Statement
@@ -372,10 +370,10 @@ typedef struct RemoveOperStmt
  */
 typedef struct RemoveStmt
 {
-	NodeTag			type;
-	int				removeType; /* P_TYPE|INDEX|RULE|VIEW */
-	char		   *name;		/* name to drop */
-}				RemoveStmt;
+	NodeTag		type;
+	int			removeType;		/* P_TYPE|INDEX|RULE|VIEW */
+	char	   *name;			/* name to drop */
+}			RemoveStmt;
 
 /* ----------------------
  *		Alter Table Statement
@@ -383,14 +381,14 @@ typedef struct RemoveStmt
  */
 typedef struct RenameStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* relation to be altered */
-	bool			inh;		/* recursively alter children? */
-	char		   *column;		/* if NULL, rename the relation name to
+	NodeTag		type;
+	char	   *relname;		/* relation to be altered */
+	bool		inh;			/* recursively alter children? */
+	char	   *column;			/* if NULL, rename the relation name to
 								 * the new name. Otherwise, rename this
 								 * column name. */
-	char		   *newname;	/* the new name */
-}				RenameStmt;
+	char	   *newname;		/* the new name */
+}			RenameStmt;
 
 /* ----------------------
  *		Create Rule Statement
@@ -398,14 +396,14 @@ typedef struct RenameStmt
  */
 typedef struct RuleStmt
 {
-	NodeTag			type;
-	char		   *rulename;	/* name of the rule */
-	Node		   *whereClause;/* qualifications */
-	CmdType			event;		/* RETRIEVE */
-	struct Attr    *object;		/* object affected */
-	bool			instead;	/* is a 'do instead'? */
-	List		   *actions;	/* the action statements */
-}				RuleStmt;
+	NodeTag		type;
+	char	   *rulename;		/* name of the rule */
+	Node	   *whereClause;	/* qualifications */
+	CmdType		event;			/* RETRIEVE */
+	struct Attr *object;		/* object affected */
+	bool		instead;		/* is a 'do instead'? */
+	List	   *actions;		/* the action statements */
+}			RuleStmt;
 
 /* ----------------------
  *		Notify Statement
@@ -413,9 +411,9 @@ typedef struct RuleStmt
  */
 typedef struct NotifyStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* relation to notify */
-}				NotifyStmt;
+	NodeTag		type;
+	char	   *relname;		/* relation to notify */
+}			NotifyStmt;
 
 /* ----------------------
  *		Listen Statement
@@ -423,9 +421,9 @@ typedef struct NotifyStmt
  */
 typedef struct ListenStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* relation to listen on */
-}				ListenStmt;
+	NodeTag		type;
+	char	   *relname;		/* relation to listen on */
+}			ListenStmt;
 
 /* ----------------------
  *		{Begin|Abort|End} Transaction Statement
@@ -433,9 +431,9 @@ typedef struct ListenStmt
  */
 typedef struct TransactionStmt
 {
-	NodeTag			type;
-	int				command;	/* BEGIN|END|ABORT */
-}				TransactionStmt;
+	NodeTag		type;
+	int			command;		/* BEGIN|END|ABORT */
+}			TransactionStmt;
 
 /* ----------------------
  *		Create View Statement
@@ -443,10 +441,10 @@ typedef struct TransactionStmt
  */
 typedef struct ViewStmt
 {
-	NodeTag			type;
-	char		   *viewname;	/* name of the view */
-	Query		   *query;		/* the SQL statement */
-}				ViewStmt;
+	NodeTag		type;
+	char	   *viewname;		/* name of the view */
+	Query	   *query;			/* the SQL statement */
+}			ViewStmt;
 
 /* ----------------------
  *		Load Statement
@@ -454,9 +452,9 @@ typedef struct ViewStmt
  */
 typedef struct LoadStmt
 {
-	NodeTag			type;
-	char		   *filename;	/* file to load */
-}				LoadStmt;
+	NodeTag		type;
+	char	   *filename;		/* file to load */
+}			LoadStmt;
 
 /* ----------------------
  *		Createdb Statement
@@ -464,9 +462,9 @@ typedef struct LoadStmt
  */
 typedef struct CreatedbStmt
 {
-	NodeTag			type;
-	char		   *dbname;		/* database to create */
-}				CreatedbStmt;
+	NodeTag		type;
+	char	   *dbname;			/* database to create */
+}			CreatedbStmt;
 
 /* ----------------------
  *		Destroydb Statement
@@ -474,9 +472,9 @@ typedef struct CreatedbStmt
  */
 typedef struct DestroydbStmt
 {
-	NodeTag			type;
-	char		   *dbname;		/* database to drop */
-}				DestroydbStmt;
+	NodeTag		type;
+	char	   *dbname;			/* database to drop */
+}			DestroydbStmt;
 
 /* ----------------------
  *		Cluster Statement (support pbrown's cluster index implementation)
@@ -484,10 +482,10 @@ typedef struct DestroydbStmt
  */
 typedef struct ClusterStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* relation being indexed */
-	char		   *indexname;	/* original index defined */
-}				ClusterStmt;
+	NodeTag		type;
+	char	   *relname;		/* relation being indexed */
+	char	   *indexname;		/* original index defined */
+}			ClusterStmt;
 
 /* ----------------------
  *		Vacuum Statement
@@ -495,12 +493,12 @@ typedef struct ClusterStmt
  */
 typedef struct VacuumStmt
 {
-	NodeTag			type;
-	bool			verbose;	/* print status info */
-	bool			analyze;	/* analyze data */
-	char		   *vacrel;		/* table to vacuum */
-	List		   *va_spec;	/* columns to analyse */
-}				VacuumStmt;
+	NodeTag		type;
+	bool		verbose;		/* print status info */
+	bool		analyze;		/* analyze data */
+	char	   *vacrel;			/* table to vacuum */
+	List	   *va_spec;		/* columns to analyse */
+}			VacuumStmt;
 
 /* ----------------------
  *		Explain Statement
@@ -508,10 +506,10 @@ typedef struct VacuumStmt
  */
 typedef struct ExplainStmt
 {
-	NodeTag			type;
-	Query		   *query;		/* the query */
-	bool			verbose;	/* print plan info */
-}				ExplainStmt;
+	NodeTag		type;
+	Query	   *query;			/* the query */
+	bool		verbose;		/* print plan info */
+}			ExplainStmt;
 
 /* ----------------------
  * Set Statement
@@ -520,10 +518,10 @@ typedef struct ExplainStmt
 
 typedef struct VariableSetStmt
 {
-	NodeTag			type;
-	char		   *name;
-	char		   *value;
-}				VariableSetStmt;
+	NodeTag		type;
+	char	   *name;
+	char	   *value;
+}			VariableSetStmt;
 
 /* ----------------------
  * Show Statement
@@ -532,9 +530,9 @@ typedef struct VariableSetStmt
 
 typedef struct VariableShowStmt
 {
-	NodeTag			type;
-	char		   *name;
-}				VariableShowStmt;
+	NodeTag		type;
+	char	   *name;
+}			VariableShowStmt;
 
 /* ----------------------
  * Reset Statement
@@ -543,9 +541,9 @@ typedef struct VariableShowStmt
 
 typedef struct VariableResetStmt
 {
-	NodeTag			type;
-	char		   *name;
-}				VariableResetStmt;
+	NodeTag		type;
+	char	   *name;
+}			VariableResetStmt;
 
 
 /*****************************************************************************
@@ -558,13 +556,13 @@ typedef struct VariableResetStmt
  */
 typedef struct AppendStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* relation to insert into */
-	List		   *cols;		/* names of the columns */
-	List		   *targetList; /* the target list (of ResTarget) */
-	List		   *fromClause; /* the from clause */
-	Node		   *whereClause;/* qualifications */
-}				AppendStmt;
+	NodeTag		type;
+	char	   *relname;		/* relation to insert into */
+	List	   *cols;			/* names of the columns */
+	List	   *targetList;		/* the target list (of ResTarget) */
+	List	   *fromClause;		/* the from clause */
+	Node	   *whereClause;	/* qualifications */
+}			AppendStmt;
 
 /* ----------------------
  *		Delete Statement
@@ -572,10 +570,10 @@ typedef struct AppendStmt
  */
 typedef struct DeleteStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* relation to delete from */
-	Node		   *whereClause;/* qualifications */
-}				DeleteStmt;
+	NodeTag		type;
+	char	   *relname;		/* relation to delete from */
+	Node	   *whereClause;	/* qualifications */
+}			DeleteStmt;
 
 /* ----------------------
  *		Update Statement
@@ -583,12 +581,12 @@ typedef struct DeleteStmt
  */
 typedef struct ReplaceStmt
 {
-	NodeTag			type;
-	char		   *relname;	/* relation to update */
-	List		   *targetList; /* the target list (of ResTarget) */
-	Node		   *whereClause;/* qualifications */
-	List		   *fromClause; /* the from clause */
-}				ReplaceStmt;
+	NodeTag		type;
+	char	   *relname;		/* relation to update */
+	List	   *targetList;		/* the target list (of ResTarget) */
+	Node	   *whereClause;	/* qualifications */
+	List	   *fromClause;		/* the from clause */
+}			ReplaceStmt;
 
 /* ----------------------
  *		Create Cursor Statement
@@ -596,16 +594,16 @@ typedef struct ReplaceStmt
  */
 typedef struct CursorStmt
 {
-	NodeTag			type;
-	char		   *portalname; /* the portal (cursor) to create */
-	bool			binary;		/* a binary (internal) portal? */
-	char		   *unique;		/* NULL, "*", or unique attribute name */
-	List		   *targetList; /* the target list (of ResTarget) */
-	List		   *fromClause; /* the from clause */
-	Node		   *whereClause;/* qualifications */
-	List		   *groupClause;/* group by clause */
-	List		   *sortClause; /* sort clause (a list of SortGroupBy's) */
-}				CursorStmt;
+	NodeTag		type;
+	char	   *portalname;		/* the portal (cursor) to create */
+	bool		binary;			/* a binary (internal) portal? */
+	char	   *unique;			/* NULL, "*", or unique attribute name */
+	List	   *targetList;		/* the target list (of ResTarget) */
+	List	   *fromClause;		/* the from clause */
+	Node	   *whereClause;	/* qualifications */
+	List	   *groupClause;	/* group by clause */
+	List	   *sortClause;		/* sort clause (a list of SortGroupBy's) */
+}			CursorStmt;
 
 /* ----------------------
  *		Select Statement
@@ -613,17 +611,17 @@ typedef struct CursorStmt
  */
 typedef struct RetrieveStmt
 {
-	NodeTag			type;
-	char		   *unique;		/* NULL, '*', or unique attribute name */
-	char		   *into;		/* name of table (for select into table) */
-	List		   *targetList; /* the target list (of ResTarget) */
-	List		   *fromClause; /* the from clause */
-	Node		   *whereClause;/* qualifications */
-	List		   *groupClause;/* group by clause */
-	Node		   *havingClause;		/* having conditional-expression */
-	List		   *selectClause;		/* subselect parameters */
-	List		   *sortClause; /* sort clause (a list of SortGroupBy's) */
-}				RetrieveStmt;
+	NodeTag		type;
+	char	   *unique;			/* NULL, '*', or unique attribute name */
+	char	   *into;			/* name of table (for select into table) */
+	List	   *targetList;		/* the target list (of ResTarget) */
+	List	   *fromClause;		/* the from clause */
+	Node	   *whereClause;	/* qualifications */
+	List	   *groupClause;	/* group by clause */
+	Node	   *havingClause;	/* having conditional-expression */
+	List	   *selectClause;	/* subselect parameters */
+	List	   *sortClause;		/* sort clause (a list of SortGroupBy's) */
+}			RetrieveStmt;
 
 
 /****************************************************************************
@@ -635,50 +633,50 @@ typedef struct RetrieveStmt
  */
 typedef struct SubSelect
 {
-	NodeTag			type;
-	char		   *unique;		/* NULL, '*', or unique attribute name */
-	List		   *targetList; /* the target list (of ResTarget) */
-	List		   *fromClause; /* the from clause */
-	Node		   *whereClause;/* qualifications */
-	List		   *groupClause;/* group by clause */
-	Node		   *havingClause;		/* having conditional-expression */
-}				SubSelect;
+	NodeTag		type;
+	char	   *unique;			/* NULL, '*', or unique attribute name */
+	List	   *targetList;		/* the target list (of ResTarget) */
+	List	   *fromClause;		/* the from clause */
+	Node	   *whereClause;	/* qualifications */
+	List	   *groupClause;	/* group by clause */
+	Node	   *havingClause;	/* having conditional-expression */
+}			SubSelect;
 
 /*
  * TypeName - specifies a type in definitions
  */
 typedef struct TypeName
 {
-	NodeTag			type;
-	char		   *name;		/* name of the type */
-	bool			timezone;	/* timezone specified? */
-	bool			setof;		/* is a set? */
-	List		   *arrayBounds;/* array bounds */
-	int				typlen;		/* length for char() and varchar() */
-}				TypeName;
+	NodeTag		type;
+	char	   *name;			/* name of the type */
+	bool		timezone;		/* timezone specified? */
+	bool		setof;			/* is a set? */
+	List	   *arrayBounds;	/* array bounds */
+	int			typlen;			/* length for char() and varchar() */
+}			TypeName;
 
 /*
  * ParamNo - specifies a parameter reference
  */
 typedef struct ParamNo
 {
-	NodeTag			type;
-	int				number;		/* the number of the parameter */
-	TypeName	   *typename;	/* the typecast */
-}				ParamNo;
+	NodeTag		type;
+	int			number;			/* the number of the parameter */
+	TypeName   *typename;		/* the typecast */
+}			ParamNo;
 
 /*
  * A_Expr - binary expressions
  */
 typedef struct A_Expr
 {
-	NodeTag			type;
-	int				oper;		/* type of operation
+	NodeTag		type;
+	int			oper;			/* type of operation
 								 * {OP,OR,AND,NOT,ISNULL,NOTNULL} */
-	char		   *opname;		/* name of operator/function */
-	Node		   *lexpr;		/* left argument */
-	Node		   *rexpr;		/* right argument */
-}				A_Expr;
+	char	   *opname;			/* name of operator/function */
+	Node	   *lexpr;			/* left argument */
+	Node	   *rexpr;			/* right argument */
+}			A_Expr;
 
 /*
  * Attr -
@@ -688,35 +686,35 @@ typedef struct A_Expr
  */
 typedef struct Attr
 {
-	NodeTag			type;
-	char		   *relname;	/* name of relation (can be "*") */
-	ParamNo		   *paramNo;	/* or a parameter */
-	List		   *attrs;		/* attributes (possibly nested); list of
+	NodeTag		type;
+	char	   *relname;		/* name of relation (can be "*") */
+	ParamNo    *paramNo;		/* or a parameter */
+	List	   *attrs;			/* attributes (possibly nested); list of
 								 * Values (strings) */
-	List		   *indirection;/* array refs (list of A_Indices') */
-}				Attr;
+	List	   *indirection;	/* array refs (list of A_Indices') */
+}			Attr;
 
 /*
  * A_Const - a constant expression
  */
 typedef struct A_Const
 {
-	NodeTag			type;
-	Value			val;		/* the value (with the tag) */
-	TypeName	   *typename;	/* typecast */
-}				A_Const;
+	NodeTag		type;
+	Value		val;			/* the value (with the tag) */
+	TypeName   *typename;		/* typecast */
+}			A_Const;
 
 /*
  * ColumnDef - column definition (used in various creates)
  */
 typedef struct ColumnDef
 {
-	NodeTag			type;
-	char		   *colname;	/* name of column */
-	TypeName	   *typename;	/* type of column */
-	bool			is_not_null;/* flag to NOT NULL constraint */
-	char		   *defval;		/* default value of column */
-}				ColumnDef;
+	NodeTag		type;
+	char	   *colname;		/* name of column */
+	TypeName   *typename;		/* type of column */
+	bool		is_not_null;	/* flag to NOT NULL constraint */
+	char	   *defval;			/* default value of column */
+}			ColumnDef;
 
 /*
  * Ident -
@@ -727,32 +725,32 @@ typedef struct ColumnDef
  */
 typedef struct Ident
 {
-	NodeTag			type;
-	char		   *name;		/* its name */
-	List		   *indirection;/* array references */
-	bool			isRel;		/* is a relation - filled in by
+	NodeTag		type;
+	char	   *name;			/* its name */
+	List	   *indirection;	/* array references */
+	bool		isRel;			/* is a relation - filled in by
 								 * transformExpr() */
-}				Ident;
+}			Ident;
 
 /*
  * FuncCall - a function/aggregate invocation
  */
 typedef struct FuncCall
 {
-	NodeTag			type;
-	char		   *funcname;	/* name of function */
-	List		   *args;		/* the arguments (list of exprs) */
-}				FuncCall;
+	NodeTag		type;
+	char	   *funcname;		/* name of function */
+	List	   *args;			/* the arguments (list of exprs) */
+}			FuncCall;
 
 /*
  * A_Indices - array reference or bounds ([lidx:uidx] or [uidx])
  */
 typedef struct A_Indices
 {
-	NodeTag			type;
-	Node		   *lidx;		/* could be NULL */
-	Node		   *uidx;
-}				A_Indices;
+	NodeTag		type;
+	Node	   *lidx;			/* could be NULL */
+	Node	   *uidx;
+}			A_Indices;
 
 /*
  * ResTarget -
@@ -760,77 +758,77 @@ typedef struct A_Indices
  */
 typedef struct ResTarget
 {
-	NodeTag			type;
-	char		   *name;		/* name of the result column */
-	List		   *indirection;/* array references */
-	Node		   *val;		/* the value of the result (A_Expr or
+	NodeTag		type;
+	char	   *name;			/* name of the result column */
+	List	   *indirection;	/* array references */
+	Node	   *val;			/* the value of the result (A_Expr or
 								 * Attr) (or A_Const) */
-}				ResTarget;
+}			ResTarget;
 
 /*
  * ParamString - used in with clauses
  */
 typedef struct ParamString
 {
-	NodeTag			type;
-	char		   *name;
-	char		   *val;
-}				ParamString;
+	NodeTag		type;
+	char	   *name;
+	char	   *val;
+}			ParamString;
 
 /*
  * TimeRange - specifies a time range
  */
 typedef struct TimeRange
 {
-	NodeTag			type;
-	char		   *startDate;
-	char		   *endDate;	/* snapshot if NULL */
-}				TimeRange;
+	NodeTag		type;
+	char	   *startDate;
+	char	   *endDate;		/* snapshot if NULL */
+}			TimeRange;
 
 /*
  * RelExpr - relation expressions
  */
 typedef struct RelExpr
 {
-	NodeTag			type;
-	char		   *relname;	/* the relation name */
-	bool			inh;		/* inheritance query */
-	TimeRange	   *timeRange;	/* the time range */
-}				RelExpr;
+	NodeTag		type;
+	char	   *relname;		/* the relation name */
+	bool		inh;			/* inheritance query */
+	TimeRange  *timeRange;		/* the time range */
+}			RelExpr;
 
 /*
  * SortGroupBy - for order by clause
  */
 typedef struct SortGroupBy
 {
-	NodeTag			type;
-	int				resno;		/* target number */
-	char		   *range;
-	char		   *name;		/* name of column to sort on */
-	char		   *useOp;		/* operator to use */
-}				SortGroupBy;
+	NodeTag		type;
+	int			resno;			/* target number */
+	char	   *range;
+	char	   *name;			/* name of column to sort on */
+	char	   *useOp;			/* operator to use */
+}			SortGroupBy;
 
 /*
  * RangeVar - range variable, used in from clauses
  */
 typedef struct RangeVar
 {
-	NodeTag			type;
-	RelExpr		   *relExpr;	/* the relation expression */
-	char		   *name;		/* the name to be referenced (optional) */
-}				RangeVar;
+	NodeTag		type;
+	RelExpr    *relExpr;		/* the relation expression */
+	char	   *name;			/* the name to be referenced (optional) */
+}			RangeVar;
 
 /*
  * IndexElem - index parameters (used in create index)
  */
 typedef struct IndexElem
 {
-	NodeTag			type;
-	char		   *name;		/* name of index */
-	List		   *args;		/* if not NULL, function index */
-	char		   *class;
-	TypeName	   *tname;		/* type of index's keys (optional) */
-}				IndexElem;
+	NodeTag		type;
+	char	   *name;			/* name of index */
+	List	   *args;			/* if not NULL, function index */
+	char	   *class;
+	TypeName   *tname;			/* type of index's keys (optional) */
+}			IndexElem;
 
 /*
  * DefElem -
@@ -838,10 +836,10 @@ typedef struct IndexElem
  */
 typedef struct DefElem
 {
-	NodeTag			type;
-	char		   *defname;
-	Node		   *arg;		/* a (Value *) or a (TypeName *) */
-}				DefElem;
+	NodeTag		type;
+	char	   *defname;
+	Node	   *arg;			/* a (Value *) or a (TypeName *) */
+}			DefElem;
 
 
 /****************************************************************************
@@ -857,11 +855,11 @@ typedef struct DefElem
  */
 typedef struct TargetEntry
 {
-	NodeTag			type;
-	Resdom		   *resdom;		/* fjoin overload this to be a list?? */
-	Fjoin		   *fjoin;
-	Node		   *expr;		/* can be a list too */
-}				TargetEntry;
+	NodeTag		type;
+	Resdom	   *resdom;			/* fjoin overload this to be a list?? */
+	Fjoin	   *fjoin;
+	Node	   *expr;			/* can be a list too */
+}			TargetEntry;
 
 /*
  * RangeTblEntry -
@@ -877,17 +875,17 @@ typedef struct TargetEntry
  */
 typedef struct RangeTblEntry
 {
-	NodeTag			type;
-	char		   *relname;	/* real name of the relation */
-	TimeRange	   *timeRange;	/* time range */
-	char		   *refname;	/* the reference name (specified in the
+	NodeTag		type;
+	char	   *relname;		/* real name of the relation */
+	TimeRange  *timeRange;		/* time range */
+	char	   *refname;		/* the reference name (specified in the
 								 * from clause) */
-	Oid				relid;
-	bool			inh;		/* inheritance? */
-	bool			archive;	/* filled in by plan_archive */
-	bool			inFromCl;	/* comes from From Clause */
-	TimeQual		timeQual;	/* filled in by pg_plan */
-}				RangeTblEntry;
+	Oid			relid;
+	bool		inh;			/* inheritance? */
+	bool		archive;		/* filled in by plan_archive */
+	bool		inFromCl;		/* comes from From Clause */
+	TimeQual	timeQual;		/* filled in by pg_plan */
+}			RangeTblEntry;
 
 /*
  * SortClause -
@@ -895,10 +893,10 @@ typedef struct RangeTblEntry
  */
 typedef struct SortClause
 {
-	NodeTag			type;
-	Resdom		   *resdom;		/* attributes in tlist to be sorted */
-	Oid				opoid;		/* sort operators */
-}				SortClause;
+	NodeTag		type;
+	Resdom	   *resdom;			/* attributes in tlist to be sorted */
+	Oid			opoid;			/* sort operators */
+}			SortClause;
 
 /*
  * GroupClause -
@@ -906,9 +904,9 @@ typedef struct SortClause
  */
 typedef struct GroupClause
 {
-	NodeTag			type;
-	TargetEntry    *entry;		/* attributes to group on */
-	Oid				grpOpoid;	/* the sort operator to use */
-}				GroupClause;
+	NodeTag		type;
+	TargetEntry *entry;			/* attributes to group on */
+	Oid			grpOpoid;		/* the sort operator to use */
+}			GroupClause;
 
 #endif							/* PARSENODES_H */
diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h
index 9afe6dfac5e..166ce53bd63 100644
--- a/src/include/nodes/pg_list.h
+++ b/src/include/nodes/pg_list.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_list.h,v 1.6 1997/09/07 04:58:45 momjian Exp $
+ * $Id: pg_list.h,v 1.7 1997/09/08 02:37:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,14 +26,14 @@
  */
 typedef struct Value
 {
-	NodeTag			type;		/* tag appropriately (eg. T_String) */
+	NodeTag		type;			/* tag appropriately (eg. T_String) */
 	union ValUnion
 	{
-		char		   *str;	/* string */
-		long			ival;
-		double			dval;
-	}				val;
-}				Value;
+		char	   *str;		/* string */
+		long		ival;
+		double		dval;
+	}			val;
+}			Value;
 
 #define intVal(v)		(((Value *)v)->val.ival)
 #define floatVal(v)		(((Value *)v)->val.dval)
@@ -46,14 +46,14 @@ typedef struct Value
  */
 typedef struct List
 {
-	NodeTag			type;
+	NodeTag		type;
 	union
 	{
-		void		   *ptr_value;
-		int				int_value;
-	}				elem;
-	struct List    *next;
-}				List;
+		void	   *ptr_value;
+		int			int_value;
+	}			elem;
+	struct List *next;
+}			List;
 
 #define    NIL			((List *) NULL)
 
@@ -81,40 +81,40 @@ typedef struct List
 /*
  * function prototypes in nodes/list.c
  */
-extern int		length(List * list);
-extern List    *append(List * list1, List * list2);
-extern List    *nconc(List * list1, List * list2);
-extern List    *lcons(void *datum, List * list);
-extern bool		member(void *foo, List * bar);
-extern Value   *makeInteger(long i);
-extern Value   *makeFloat(double d);
-extern Value   *makeString(char *str);
-extern List    *makeList(void *elem,...);
-extern List    *lappend(List * list, void *obj);
-extern List    *lremove(void *elem, List * list);
-extern void		freeList(List * list);
-extern List    *LispRemove(void *elem, List * list);
-
-extern void    *nth(int n, List * l);
-extern void		set_nth(List * l, int n, void *elem);
-
-List		   *lconsi(int datum, List * list);
-List		   *lappendi(List * list, int datum);
-extern bool		intMember(int, List *);
-extern List    *intAppend(List * list1, List * list2);
-
-extern int		nthi(int n, List * l);
-
-extern List    *nreverse(List *);
-extern List    *set_difference(List *, List *);
-extern List    *set_differencei(List *, List *);
-extern List    *LispUnion(List * foo, List * bar);
-extern List    *LispUnioni(List * foo, List * bar);
-extern bool		same(List * foo, List * bar);
+extern int	length(List * list);
+extern List *append(List * list1, List * list2);
+extern List *nconc(List * list1, List * list2);
+extern List *lcons(void *datum, List * list);
+extern bool member(void *foo, List * bar);
+extern Value *makeInteger(long i);
+extern Value *makeFloat(double d);
+extern Value *makeString(char *str);
+extern List *makeList(void *elem,...);
+extern List *lappend(List * list, void *obj);
+extern List *lremove(void *elem, List * list);
+extern void freeList(List * list);
+extern List *LispRemove(void *elem, List * list);
+
+extern void *nth(int n, List * l);
+extern void set_nth(List * l, int n, void *elem);
+
+List	   *lconsi(int datum, List * list);
+List	   *lappendi(List * list, int datum);
+extern bool intMember(int, List *);
+extern List *intAppend(List * list1, List * list2);
+
+extern int	nthi(int n, List * l);
+
+extern List *nreverse(List *);
+extern List *set_difference(List *, List *);
+extern List *set_differencei(List *, List *);
+extern List *LispUnion(List * foo, List * bar);
+extern List *LispUnioni(List * foo, List * bar);
+extern bool same(List * foo, List * bar);
 
 /* should be in nodes.h but needs List */
 
 /* in copyfuncs.c */
-extern List    *listCopy(List *);
+extern List *listCopy(List *);
 
 #endif							/* PG_LIST_H */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 3353602e02c..6942d206fb8 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.7 1997/09/07 04:58:46 momjian Exp $
+ * $Id: plannodes.h,v 1.8 1997/09/08 02:37:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,19 +63,19 @@
 
 typedef struct Plan
 {
-	NodeTag			type;
-	Cost			cost;
-	int				plan_size;
-	int				plan_width;
-	int				plan_tupperpage;
-	EState		   *state;		/* at execution time, state's of
+	NodeTag		type;
+	Cost		cost;
+	int			plan_size;
+	int			plan_width;
+	int			plan_tupperpage;
+	EState	   *state;			/* at execution time, state's of
 								 * individual nodes point to one EState
 								 * for the whole top-level plan */
-	List		   *targetlist;
-	List		   *qual;		/* Node* or List* ?? */
-	struct Plan    *lefttree;
-	struct Plan    *righttree;
-}				Plan;
+	List	   *targetlist;
+	List	   *qual;			/* Node* or List* ?? */
+	struct Plan *lefttree;
+	struct Plan *righttree;
+}			Plan;
 
 /* ----------------
  *	these are are defined to avoid confusion problems with "left"
@@ -104,7 +104,7 @@ typedef struct Plan
  *		existential node
  * ----------------
  */
-typedef Plan	Existential;
+typedef Plan Existential;
 
 /* ----------------
  *	 result node -
@@ -113,10 +113,10 @@ typedef Plan	Existential;
  */
 typedef struct Result
 {
-	Plan			plan;
-	Node		   *resconstantqual;
-	ResultState    *resstate;
-}				Result;
+	Plan		plan;
+	Node	   *resconstantqual;
+	ResultState *resstate;
+}			Result;
 
 /* ----------------
  *		append node
@@ -124,12 +124,12 @@ typedef struct Result
  */
 typedef struct Append
 {
-	Plan			plan;
-	List		   *unionplans;
-	Index			unionrelid;
-	List		   *unionrtentries;
-	AppendState    *unionstate;
-}				Append;
+	Plan		plan;
+	List	   *unionplans;
+	Index		unionrelid;
+	List	   *unionrtentries;
+	AppendState *unionstate;
+}			Append;
 
 /*
  * ==========
@@ -138,16 +138,16 @@ typedef struct Append
  */
 typedef struct Scan
 {
-	Plan			plan;
-	Index			scanrelid;	/* relid is index into the range table */
+	Plan		plan;
+	Index		scanrelid;		/* relid is index into the range table */
 	CommonScanState *scanstate;
-}				Scan;
+}			Scan;
 
 /* ----------------
  *		sequential scan node
  * ----------------
  */
-typedef Scan	SeqScan;
+typedef Scan SeqScan;
 
 /* ----------------
  *		index scan node
@@ -155,11 +155,11 @@ typedef Scan	SeqScan;
  */
 typedef struct IndexScan
 {
-	Scan			scan;
-	List		   *indxid;
-	List		   *indxqual;
+	Scan		scan;
+	List	   *indxid;
+	List	   *indxqual;
 	IndexScanState *indxstate;
-}				IndexScan;
+}			IndexScan;
 
 /*
  * ==========
@@ -171,7 +171,7 @@ typedef struct IndexScan
  *		Join node
  * ----------------
  */
-typedef Plan	Join;
+typedef Plan Join;
 
 /* ----------------
  *		nest loop join node
@@ -179,9 +179,9 @@ typedef Plan	Join;
  */
 typedef struct NestLoop
 {
-	Join			join;
-	NestLoopState  *nlstate;
-}				NestLoop;
+	Join		join;
+	NestLoopState *nlstate;
+}			NestLoop;
 
 /* ----------------
  *		merge join node
@@ -189,13 +189,13 @@ typedef struct NestLoop
  */
 typedef struct MergeJoin
 {
-	Join			join;
-	List		   *mergeclauses;
-	Oid				mergesortop;
-	Oid			   *mergerightorder;	/* inner sort operator */
-	Oid			   *mergeleftorder;		/* outer sort operator */
+	Join		join;
+	List	   *mergeclauses;
+	Oid			mergesortop;
+	Oid		   *mergerightorder;/* inner sort operator */
+	Oid		   *mergeleftorder; /* outer sort operator */
 	MergeJoinState *mergestate;
-}				MergeJoin;
+}			MergeJoin;
 
 /* ----------------
  *		hash join (probe) node
@@ -203,15 +203,15 @@ typedef struct MergeJoin
  */
 typedef struct HashJoin
 {
-	Join			join;
-	List		   *hashclauses;
-	Oid				hashjoinop;
-	HashJoinState  *hashjoinstate;
-	HashJoinTable	hashjointable;
-	IpcMemoryKey	hashjointablekey;
-	int				hashjointablesize;
-	bool			hashdone;
-}				HashJoin;
+	Join		join;
+	List	   *hashclauses;
+	Oid			hashjoinop;
+	HashJoinState *hashjoinstate;
+	HashJoinTable hashjointable;
+	IpcMemoryKey hashjointablekey;
+	int			hashjointablesize;
+	bool		hashdone;
+}			HashJoin;
 
 /* ---------------
  *		aggregate node
@@ -219,11 +219,11 @@ typedef struct HashJoin
  */
 typedef struct Agg
 {
-	Plan			plan;
-	int				numAgg;
-	Aggreg		  **aggs;
-	AggState	   *aggstate;
-}				Agg;
+	Plan		plan;
+	int			numAgg;
+	Aggreg	  **aggs;
+	AggState   *aggstate;
+}			Agg;
 
 /* ---------------
  *	 group node -
@@ -237,13 +237,12 @@ typedef struct Agg
  */
 typedef struct Group
 {
-	Plan			plan;
-	bool			tuplePerGroup;		/* what tuples to return (see
-										 * above) */
-	int				numCols;	/* number of group columns */
-	AttrNumber	   *grpColIdx;	/* index into the target list */
-	GroupState	   *grpstate;
-}				Group;
+	Plan		plan;
+	bool		tuplePerGroup;	/* what tuples to return (see above) */
+	int			numCols;		/* number of group columns */
+	AttrNumber *grpColIdx;		/* index into the target list */
+	GroupState *grpstate;
+}			Group;
 
 /*
  * ==========
@@ -252,10 +251,10 @@ typedef struct Group
  */
 typedef struct Temp
 {
-	Plan			plan;
-	Oid				tempid;
-	int				keycount;
-}				Temp;
+	Plan		plan;
+	Oid			tempid;
+	int			keycount;
+}			Temp;
 
 /* ----------------
  *		materialization node
@@ -263,11 +262,11 @@ typedef struct Temp
  */
 typedef struct Material
 {
-	Plan			plan;		/* temp node flattened out */
-	Oid				tempid;
-	int				keycount;
-	MaterialState  *matstate;
-}				Material;
+	Plan		plan;			/* temp node flattened out */
+	Oid			tempid;
+	int			keycount;
+	MaterialState *matstate;
+}			Material;
 
 /* ----------------
  *		sort node
@@ -275,13 +274,13 @@ typedef struct Material
  */
 typedef struct Sort
 {
-	Plan			plan;		/* temp node flattened out */
-	Oid				tempid;
-	int				keycount;
-	SortState	   *sortstate;
-	void		   *psortstate;
-	bool			cleaned;
-}				Sort;
+	Plan		plan;			/* temp node flattened out */
+	Oid			tempid;
+	int			keycount;
+	SortState  *sortstate;
+	void	   *psortstate;
+	bool		cleaned;
+}			Sort;
 
 /* ----------------
  *		unique node
@@ -289,15 +288,15 @@ typedef struct Sort
  */
 typedef struct Unique
 {
-	Plan			plan;		/* temp node flattened out */
-	Oid				tempid;
-	int				keycount;
-	char		   *uniqueAttr; /* NULL if all attrs, or unique attribute
+	Plan		plan;			/* temp node flattened out */
+	Oid			tempid;
+	int			keycount;
+	char	   *uniqueAttr;		/* NULL if all attrs, or unique attribute
 								 * name */
-	AttrNumber		uniqueAttrNum;		/* attribute number of attribute
-										 * to select distinct on */
-	UniqueState    *uniquestate;
-}				Unique;
+	AttrNumber	uniqueAttrNum;	/* attribute number of attribute to select
+								 * distinct on */
+	UniqueState *uniquestate;
+}			Unique;
 
 /* ----------------
  *		hash build node
@@ -305,13 +304,13 @@ typedef struct Unique
  */
 typedef struct Hash
 {
-	Plan			plan;
-	Var			   *hashkey;
-	HashState	   *hashstate;
-	HashJoinTable	hashtable;
-	IpcMemoryKey	hashtablekey;
-	int				hashtablesize;
-}				Hash;
+	Plan		plan;
+	Var		   *hashkey;
+	HashState  *hashstate;
+	HashJoinTable hashtable;
+	IpcMemoryKey hashtablekey;
+	int			hashtablesize;
+}			Hash;
 
 /* ---------------------
  *		choose node
@@ -319,9 +318,9 @@ typedef struct Hash
  */
 typedef struct Choose
 {
-	Plan			plan;
-	List		   *chooseplanlist;
-}				Choose;
+	Plan		plan;
+	List	   *chooseplanlist;
+}			Choose;
 
 /* -------------------
  *		Tee node information
@@ -332,15 +331,15 @@ typedef struct Choose
 */
 typedef struct Tee
 {
-	Plan			plan;
-	Plan		   *leftParent;
-	Plan		   *rightParent;
-	TeeState	   *teestate;
-	char		   *teeTableName;		/* the name of the table to
-										 * materialize the tee into */
-	List		   *rtentries;	/* the range table for the plan below the
+	Plan		plan;
+	Plan	   *leftParent;
+	Plan	   *rightParent;
+	TeeState   *teestate;
+	char	   *teeTableName;	/* the name of the table to materialize
+								 * the tee into */
+	List	   *rtentries;		/* the range table for the plan below the
 								 * Tee may be different than the parent
 								 * plans */
-}				Tee;
+}			Tee;
 
 #endif							/* PLANNODES_H */
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 66d5a52a17e..e28c3128857 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.8 1997/09/07 04:58:46 momjian Exp $
+ * $Id: primnodes.h,v 1.9 1997/09/08 02:37:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,15 +38,15 @@
  */
 typedef struct Resdom
 {
-	NodeTag			type;
-	AttrNumber		resno;
-	Oid				restype;
-	int				reslen;
-	char		   *resname;
-	Index			reskey;
-	Oid				reskeyop;
-	int				resjunk;
-}				Resdom;
+	NodeTag		type;
+	AttrNumber	resno;
+	Oid			restype;
+	int			reslen;
+	char	   *resname;
+	Index		reskey;
+	Oid			reskeyop;
+	int			resjunk;
+}			Resdom;
 
 /* -------------
  * Fjoin
@@ -67,13 +67,13 @@ typedef struct Resdom
  */
 typedef struct Fjoin
 {
-	NodeTag			type;
-	bool			fj_initialized;
-	int				fj_nNodes;
-	List		   *fj_innerNode;
-	DatumPtr		fj_results;
-	BoolPtr			fj_alwaysDone;
-}				Fjoin;
+	NodeTag		type;
+	bool		fj_initialized;
+	int			fj_nNodes;
+	List	   *fj_innerNode;
+	DatumPtr	fj_results;
+	BoolPtr		fj_alwaysDone;
+}			Fjoin;
 
 /* ----------------
  * Expr
@@ -87,16 +87,16 @@ typedef struct Fjoin
 typedef enum OpType
 {
 	OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR
-}				OpType;
+}			OpType;
 
 typedef struct Expr
 {
-	NodeTag			type;
-	Oid				typeOid;	/* oid of the type of this expr */
-	OpType			opType;		/* type of the op */
-	Node		   *oper;		/* could be Oper or Func */
-	List		   *args;		/* list of argument nodes */
-}				Expr;
+	NodeTag		type;
+	Oid			typeOid;		/* oid of the type of this expr */
+	OpType		opType;			/* type of the op */
+	Node	   *oper;			/* could be Oper or Func */
+	List	   *args;			/* list of argument nodes */
+}			Expr;
 
 /* ----------------
  * Var
@@ -118,13 +118,13 @@ typedef struct Expr
 
 typedef struct Var
 {
-	NodeTag			type;
-	Index			varno;
-	AttrNumber		varattno;
-	Oid				vartype;
-	Index			varnoold;	/* only used by optimizer */
-	AttrNumber		varoattno;	/* only used by optimizer */
-}				Var;
+	NodeTag		type;
+	Index		varno;
+	AttrNumber	varattno;
+	Oid			vartype;
+	Index		varnoold;		/* only used by optimizer */
+	AttrNumber	varoattno;		/* only used by optimizer */
+}			Var;
 
 /* ----------------
  * Oper
@@ -148,13 +148,13 @@ typedef struct Var
  */
 typedef struct Oper
 {
-	NodeTag			type;
-	Oid				opno;
-	Oid				opid;
-	Oid				opresulttype;
-	int				opsize;
+	NodeTag		type;
+	Oid			opno;
+	Oid			opid;
+	Oid			opresulttype;
+	int			opsize;
 	FunctionCachePtr op_fcache;
-}				Oper;
+}			Oper;
 
 
 /* ----------------
@@ -175,15 +175,15 @@ typedef struct Oper
  */
 typedef struct Const
 {
-	NodeTag			type;
-	Oid				consttype;
-	Size			constlen;
-	Datum			constvalue;
-	bool			constisnull;
-	bool			constbyval;
-	bool			constisset;
-	bool			constiscast;
-}				Const;
+	NodeTag		type;
+	Oid			consttype;
+	Size		constlen;
+	Datum		constvalue;
+	bool		constisnull;
+	bool		constbyval;
+	bool		constisset;
+	bool		constiscast;
+}			Const;
 
 /* ----------------
  * Param
@@ -214,13 +214,13 @@ typedef struct Const
  */
 typedef struct Param
 {
-	NodeTag			type;
-	int				paramkind;
-	AttrNumber		paramid;
-	char		   *paramname;
-	Oid				paramtype;
-	List		   *param_tlist;
-}				Param;
+	NodeTag		type;
+	int			paramkind;
+	AttrNumber	paramid;
+	char	   *paramname;
+	Oid			paramtype;
+	List	   *param_tlist;
+}			Param;
 
 
 /* ----------------
@@ -240,15 +240,15 @@ typedef struct Param
  */
 typedef struct Func
 {
-	NodeTag			type;
-	Oid				funcid;
-	Oid				functype;
-	bool			funcisindex;
-	int				funcsize;
+	NodeTag		type;
+	Oid			funcid;
+	Oid			functype;
+	bool		funcisindex;
+	int			funcsize;
 	FunctionCachePtr func_fcache;
-	List		   *func_tlist;
-	List		   *func_planlist;
-}				Func;
+	List	   *func_tlist;
+	List	   *func_planlist;
+}			Func;
 
 /* ----------------
  * Aggreg
@@ -261,13 +261,13 @@ typedef struct Func
  */
 typedef struct Aggreg
 {
-	NodeTag			type;
-	char		   *aggname;
-	Oid				basetype;	/* base type of the aggregate */
-	Oid				aggtype;	/* type of final result */
-	Node		   *target;		/* attribute to aggreg on */
-	int				aggno;		/* index to ecxt_values */
-}				Aggreg;
+	NodeTag		type;
+	char	   *aggname;
+	Oid			basetype;		/* base type of the aggregate */
+	Oid			aggtype;		/* type of final result */
+	Node	   *target;			/* attribute to aggreg on */
+	int			aggno;			/* index to ecxt_values */
+}			Aggreg;
 
 /* ----------------
  * Array
@@ -286,15 +286,15 @@ typedef struct Aggreg
  */
 typedef struct Array
 {
-	NodeTag			type;
-	Oid				arrayelemtype;
-	int				arrayelemlength;
-	bool			arrayelembyval;
-	int				arrayndim;
-	IntArray		arraylow;
-	IntArray		arrayhigh;
-	int				arraylen;
-}				Array;
+	NodeTag		type;
+	Oid			arrayelemtype;
+	int			arrayelemlength;
+	bool		arrayelembyval;
+	int			arrayndim;
+	IntArray	arraylow;
+	IntArray	arrayhigh;
+	int			arraylen;
+}			Array;
 
 /* ----------------
  *	ArrayRef:
@@ -310,15 +310,15 @@ typedef struct Array
  */
 typedef struct ArrayRef
 {
-	NodeTag			type;
-	int				refattrlength;
-	int				refelemlength;
-	Oid				refelemtype;
-	bool			refelembyval;
-	List		   *refupperindexpr;
-	List		   *reflowerindexpr;
-	Node		   *refexpr;
-	Node		   *refassgnexpr;
-}				ArrayRef;
+	NodeTag		type;
+	int			refattrlength;
+	int			refelemlength;
+	Oid			refelemtype;
+	bool		refelembyval;
+	List	   *refupperindexpr;
+	List	   *reflowerindexpr;
+	Node	   *refexpr;
+	Node	   *refassgnexpr;
+}			ArrayRef;
 
 #endif							/* PRIMNODES_H */
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index 8e1a80267d0..bef8ce3a6ce 100644
--- a/src/include/nodes/print.h
+++ b/src/include/nodes/print.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: print.h,v 1.3 1997/09/07 04:58:47 momjian Exp $
+ * $Id: print.h,v 1.4 1997/09/08 02:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,16 +19,16 @@
 #include "nodes/relation.h"
 #include "executor/tuptable.h"
 
-extern void		print(void *obj);
-extern void		pprint(void *obj);
-extern void		print_rt(List * rtable);
-extern void		print_expr(Node * expr, List * rtable);
-extern void		print_keys(List * keys, List * rtable);
-extern void		print_tl(List * tlist, List * rtable);
-extern void		print_slot(TupleTableSlot * slot);
+extern void print(void *obj);
+extern void pprint(void *obj);
+extern void print_rt(List * rtable);
+extern void print_expr(Node * expr, List * rtable);
+extern void print_keys(List * keys, List * rtable);
+extern void print_tl(List * tlist, List * rtable);
+extern void print_slot(TupleTableSlot * slot);
 extern void
 print_plan_recursive(Plan * p, Query * parsetree,
 					 int indentLevel, char *label);
-extern void		print_plan(Plan * p, Query * parsetree);
+extern void print_plan(Plan * p, Query * parsetree);
 
 #endif							/* PRINT_H */
diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h
index 8a23d550a90..72007ec9132 100644
--- a/src/include/nodes/readfuncs.h
+++ b/src/include/nodes/readfuncs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: readfuncs.h,v 1.3 1997/09/07 04:58:48 momjian Exp $
+ * $Id: readfuncs.h,v 1.4 1997/09/08 02:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,12 +16,12 @@
 /*
  * prototypes for functions in read.c (the lisp token parser)
  */
-extern char    *lsptok(char *string, int *length);
-extern void    *nodeRead(bool read_car_only);
+extern char *lsptok(char *string, int *length);
+extern void *nodeRead(bool read_car_only);
 
 /*
  * prototypes for functions in readfuncs.c
  */
-extern Node    *parsePlanString(void);
+extern Node *parsePlanString(void);
 
 #endif							/* READFUNCS_H */
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 7acbc3d466c..4dfcb6692dc 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relation.h,v 1.5 1997/09/07 04:58:48 momjian Exp $
+ * $Id: relation.h,v 1.6 1997/09/08 02:37:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,7 @@
  *		List of relation identifiers (indexes into the rangetable).
  */
 
-typedef List   *Relid;
+typedef List *Relid;
 
 /*
  * Rel
@@ -73,117 +73,117 @@ typedef List   *Relid;
 
 typedef struct Rel
 {
-	NodeTag			type;
+	NodeTag		type;
 
 	/* all relations: */
-	Relid			relids;
+	Relid		relids;
 
 	/* catalog statistics information */
-	bool			indexed;
-	int				pages;
-	int				tuples;
-	int				size;
-	int				width;
+	bool		indexed;
+	int			pages;
+	int			tuples;
+	int			size;
+	int			width;
 
 	/* materialization information */
-	List		   *targetlist;
-	List		   *pathlist;
-	struct Path    *unorderedpath;
-	struct Path    *cheapestpath;
-	bool			pruneable;
+	List	   *targetlist;
+	List	   *pathlist;
+	struct Path *unorderedpath;
+	struct Path *cheapestpath;
+	bool		pruneable;
 
 	/* used solely by indices: */
-	Oid			   *classlist;	/* classes of AM operators */
-	int			   *indexkeys;	/* keys over which we're indexing */
-	Oid				relam;		/* OID of the access method (in pg_am) */
+	Oid		   *classlist;		/* classes of AM operators */
+	int		   *indexkeys;		/* keys over which we're indexing */
+	Oid			relam;			/* OID of the access method (in pg_am) */
 
-	Oid				indproc;
-	List		   *indpred;
+	Oid			indproc;
+	List	   *indpred;
 
 	/* used by various scans and joins: */
-	Oid			   *ordering;	/* OID of operators in sort order */
-	List		   *clauseinfo; /* restriction clauses */
-	List		   *joininfo;	/* join clauses */
-	List		   *innerjoin;
-	List		   *superrels;
-}				Rel;
+	Oid		   *ordering;		/* OID of operators in sort order */
+	List	   *clauseinfo;		/* restriction clauses */
+	List	   *joininfo;		/* join clauses */
+	List	   *innerjoin;
+	List	   *superrels;
+}			Rel;
 
-extern Var	   *get_expr(TargetEntry * foo);
+extern Var *get_expr(TargetEntry * foo);
 
 typedef struct MergeOrder
 {
-	NodeTag			type;
-	Oid				join_operator;
-	Oid				left_operator;
-	Oid				right_operator;
-	Oid				left_type;
-	Oid				right_type;
-}				MergeOrder;
+	NodeTag		type;
+	Oid			join_operator;
+	Oid			left_operator;
+	Oid			right_operator;
+	Oid			left_type;
+	Oid			right_type;
+}			MergeOrder;
 
 typedef enum OrderType
 {
 	MERGE_ORDER, SORTOP_ORDER
-}				OrderType;
+}			OrderType;
 
 typedef struct PathOrder
 {
-	OrderType		ordtype;
+	OrderType	ordtype;
 	union
 	{
-		Oid			   *sortop;
-		MergeOrder	   *merge;
-	}				ord;
-}				PathOrder;
+		Oid		   *sortop;
+		MergeOrder *merge;
+	}			ord;
+}			PathOrder;
 
 typedef struct Path
 {
-	NodeTag			type;
+	NodeTag		type;
 
-	Rel			   *parent;
-	Cost			path_cost;
+	Rel		   *parent;
+	Cost		path_cost;
 
-	NodeTag			pathtype;
+	NodeTag		pathtype;
 
-	PathOrder		p_ordering;
+	PathOrder	p_ordering;
 
-	List		   *keys;
-	Cost			outerjoincost;
-	Relid			joinid;
-	List		   *locclauseinfo;
-}				Path;
+	List	   *keys;
+	Cost		outerjoincost;
+	Relid		joinid;
+	List	   *locclauseinfo;
+}			Path;
 
 typedef struct IndexPath
 {
-	Path			path;
-	List		   *indexid;
-	List		   *indexqual;
-	int			   *indexkeys;	/* to transform heap attnos into index
+	Path		path;
+	List	   *indexid;
+	List	   *indexqual;
+	int		   *indexkeys;		/* to transform heap attnos into index
 								 * ones */
-}				IndexPath;
+}			IndexPath;
 
 typedef struct JoinPath
 {
-	Path			path;
-	List		   *pathclauseinfo;
-	Path		   *outerjoinpath;
-	Path		   *innerjoinpath;
-}				JoinPath;
+	Path		path;
+	List	   *pathclauseinfo;
+	Path	   *outerjoinpath;
+	Path	   *innerjoinpath;
+}			JoinPath;
 
 typedef struct MergePath
 {
-	JoinPath		jpath;
-	List		   *path_mergeclauses;
-	List		   *outersortkeys;
-	List		   *innersortkeys;
-}				MergePath;
+	JoinPath	jpath;
+	List	   *path_mergeclauses;
+	List	   *outersortkeys;
+	List	   *innersortkeys;
+}			MergePath;
 
 typedef struct HashPath
 {
-	JoinPath		jpath;
-	List		   *path_hashclauses;
-	List		   *outerhashkeys;
-	List		   *innerhashkeys;
-}				HashPath;
+	JoinPath	jpath;
+	List	   *path_hashclauses;
+	List	   *outerhashkeys;
+	List	   *innerhashkeys;
+}			HashPath;
 
 /******
  * Keys
@@ -191,17 +191,17 @@ typedef struct HashPath
 
 typedef struct OrderKey
 {
-	NodeTag			type;
-	int				attribute_number;
-	Index			array_index;
-}				OrderKey;
+	NodeTag		type;
+	int			attribute_number;
+	Index		array_index;
+}			OrderKey;
 
 typedef struct JoinKey
 {
-	NodeTag			type;
-	Var			   *outer;
-	Var			   *inner;
-}				JoinKey;
+	NodeTag		type;
+	Var		   *outer;
+	Var		   *inner;
+}			JoinKey;
 
 /*******
  * clause info
@@ -209,56 +209,56 @@ typedef struct JoinKey
 
 typedef struct CInfo
 {
-	NodeTag			type;
-	Expr		   *clause;		/* should be an OP clause */
-	Cost			selectivity;
-	bool			notclause;
-	List		   *indexids;
+	NodeTag		type;
+	Expr	   *clause;			/* should be an OP clause */
+	Cost		selectivity;
+	bool		notclause;
+	List	   *indexids;
 
 	/* mergesort only */
-	MergeOrder	   *mergesortorder;
+	MergeOrder *mergesortorder;
 
 	/* hashjoin only */
-	Oid				hashjoinoperator;
-	Relid			cinfojoinid;
-}				CInfo;
+	Oid			hashjoinoperator;
+	Relid		cinfojoinid;
+}			CInfo;
 
 typedef struct JoinMethod
 {
-	NodeTag			type;
-	List		   *jmkeys;
-	List		   *clauses;
-}				JoinMethod;
+	NodeTag		type;
+	List	   *jmkeys;
+	List	   *clauses;
+}			JoinMethod;
 
 typedef struct HInfo
 {
-	JoinMethod		jmethod;
-	Oid				hashop;
-}				HInfo;
+	JoinMethod	jmethod;
+	Oid			hashop;
+}			HInfo;
 
 typedef struct MInfo
 {
-	JoinMethod		jmethod;
-	MergeOrder	   *m_ordering;
-}				MInfo;
+	JoinMethod	jmethod;
+	MergeOrder *m_ordering;
+}			MInfo;
 
 typedef struct JInfo
 {
-	NodeTag			type;
-	List		   *otherrels;
-	List		   *jinfoclauseinfo;
-	bool			mergesortable;
-	bool			hashjoinable;
-	bool			inactive;
-}				JInfo;
+	NodeTag		type;
+	List	   *otherrels;
+	List	   *jinfoclauseinfo;
+	bool		mergesortable;
+	bool		hashjoinable;
+	bool		inactive;
+}			JInfo;
 
 typedef struct Iter
 {
-	NodeTag			type;
-	Node		   *iterexpr;
-	Oid				itertype;	/* type of the iter expr (use for type
+	NodeTag		type;
+	Node	   *iterexpr;
+	Oid			itertype;		/* type of the iter expr (use for type
 								 * checking) */
-}				Iter;
+}			Iter;
 
 /*
 ** Stream:
@@ -283,15 +283,15 @@ typedef struct Stream *StreamPtr;
 
 typedef struct Stream
 {
-	NodeTag			type;
-	Path		   *pathptr;
-	CInfo		   *cinfo;
-	int			   *clausetype;
-	struct Stream  *upstream;
-	struct Stream  *downstream;
-	bool			groupup;
-	Cost			groupcost;
-	Cost			groupsel;
-}				Stream;
+	NodeTag		type;
+	Path	   *pathptr;
+	CInfo	   *cinfo;
+	int		   *clausetype;
+	struct Stream *upstream;
+	struct Stream *downstream;
+	bool		groupup;
+	Cost		groupcost;
+	Cost		groupsel;
+}			Stream;
 
 #endif							/* RELATION_H */
diff --git a/src/include/optimizer/clauseinfo.h b/src/include/optimizer/clauseinfo.h
index 028979eeb11..d6f034a4b58 100644
--- a/src/include/optimizer/clauseinfo.h
+++ b/src/include/optimizer/clauseinfo.h
@@ -6,21 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauseinfo.h,v 1.2 1997/09/07 04:58:52 momjian Exp $
+ * $Id: clauseinfo.h,v 1.3 1997/09/08 02:37:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef CLAUSEINFO_H
 #define CLAUSEINFO_H
 
-extern bool		valid_or_clause(CInfo * clauseinfo);
-extern List    *get_actual_clauses(List * clauseinfo_list);
+extern bool valid_or_clause(CInfo * clauseinfo);
+extern List *get_actual_clauses(List * clauseinfo_list);
 extern void
 get_relattvals(List * clauseinfo_list, List ** attnos,
 			   List ** values, List ** flags);
 extern void
 get_joinvars(Oid relid, List * clauseinfo_list,
 			 List ** attnos, List ** values, List ** flags);
-extern List    *get_opnos(List * clauseinfo_list);
+extern List *get_opnos(List * clauseinfo_list);
 
 #endif							/* CLAUSEINFO_H */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index bb8d09a4da4..358b772b3f9 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.4 1997/09/07 04:58:54 momjian Exp $
+ * $Id: clauses.h,v 1.5 1997/09/08 02:37:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,39 +15,39 @@
 
 #include <nodes/primnodes.h>
 
-extern Expr    *make_clause(int type, Node * oper, List * args);
-extern bool		is_opclause(Node * clause);
-extern Expr    *make_opclause(Oper * op, Var * leftop, Var * rightop);
-extern Var	   *get_leftop(Expr * clause);
-extern Var	   *get_rightop(Expr * clause);
-
-extern bool		is_funcclause(Node * clause);
-extern Expr    *make_funcclause(Func * func, List * funcargs);
-
-extern bool		or_clause(Node * clause);
-extern Expr    *make_orclause(List * orclauses);
-
-extern bool		not_clause(Node * clause);
-extern Expr    *make_notclause(Expr * notclause);
-extern Expr    *get_notclausearg(Expr * notclause);
-
-extern bool		and_clause(Node * clause);
-extern Expr    *make_andclause(List * andclauses);
-
-extern List    *pull_constant_clauses(List * quals, List ** constantQual);
-extern void		clause_relids_vars(Node * clause, List ** relids, List ** vars);
-extern int		NumRelids(Node * clause);
-extern bool		contains_not(Node * clause);
-extern bool		join_clause_p(Node * clause);
-extern bool		qual_clause_p(Node * clause);
-extern void		fix_opid(Node * clause);
-extern List    *fix_opids(List * clauses);
+extern Expr *make_clause(int type, Node * oper, List * args);
+extern bool is_opclause(Node * clause);
+extern Expr *make_opclause(Oper * op, Var * leftop, Var * rightop);
+extern Var *get_leftop(Expr * clause);
+extern Var *get_rightop(Expr * clause);
+
+extern bool is_funcclause(Node * clause);
+extern Expr *make_funcclause(Func * func, List * funcargs);
+
+extern bool or_clause(Node * clause);
+extern Expr *make_orclause(List * orclauses);
+
+extern bool not_clause(Node * clause);
+extern Expr *make_notclause(Expr * notclause);
+extern Expr *get_notclausearg(Expr * notclause);
+
+extern bool and_clause(Node * clause);
+extern Expr *make_andclause(List * andclauses);
+
+extern List *pull_constant_clauses(List * quals, List ** constantQual);
+extern void clause_relids_vars(Node * clause, List ** relids, List ** vars);
+extern int	NumRelids(Node * clause);
+extern bool contains_not(Node * clause);
+extern bool join_clause_p(Node * clause);
+extern bool qual_clause_p(Node * clause);
+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);
 extern void
 get_rels_atts(Node * clause, int *relid1,
 			  AttrNumber * attno1, int *relid2, AttrNumber * attno2);
-extern void		CommuteClause(Node * clause);
+extern void CommuteClause(Node * clause);
 
 #endif							/* CLAUSES_H */
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index bb50d92948c..a0ab3a59466 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.3 1997/09/07 04:58:56 momjian Exp $
+ * $Id: cost.h,v 1.4 1997/09/08 02:37:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,45 +17,45 @@
  * prototypes for costsize.c--
  *	  routines to compute costs and sizes
  */
-extern bool		_enable_seqscan_;
-extern bool		_enable_indexscan_;
-extern bool		_enable_sort_;
-extern bool		_enable_hash_;
-extern bool		_enable_nestloop_;
-extern bool		_enable_mergesort_;
-extern bool		_enable_hashjoin_;
+extern bool _enable_seqscan_;
+extern bool _enable_indexscan_;
+extern bool _enable_sort_;
+extern bool _enable_hash_;
+extern bool _enable_nestloop_;
+extern bool _enable_mergesort_;
+extern bool _enable_hashjoin_;
 
-extern Cost		cost_seqscan(int relid, int relpages, int reltuples);
-extern Cost
+extern Cost cost_seqscan(int relid, int relpages, int reltuples);
+extern		Cost
 cost_index(Oid indexid, int expected_indexpages, Cost selec,
 		   int relpages, int reltuples, int indexpages,
 		   int indextuples, bool is_injoin);
-extern Cost		cost_sort(List * keys, int tuples, int width, bool noread);
-extern Cost
+extern Cost cost_sort(List * keys, int tuples, int width, bool noread);
+extern		Cost
 cost_nestloop(Cost outercost, Cost innercost, int outertuples,
 			  int innertuples, int outerpages, bool is_indexjoin);
-extern Cost
+extern		Cost
 cost_mergesort(Cost outercost, Cost innercost,
 			   List * outersortkeys, List * innersortkeys,
 		   int outersize, int innersize, int outerwidth, int innerwidth);
-extern Cost
+extern		Cost
 cost_hashjoin(Cost outercost, Cost innercost, List * outerkeys,
 			  List * innerkeys, int outersize, int innersize,
 			  int outerwidth, int innerwidth);
-extern int		compute_rel_size(Rel * rel);
-extern int		compute_rel_width(Rel * rel);
-extern int		compute_joinrel_size(JoinPath * joinpath);
-extern int		page_size(int tuples, int width);
+extern int	compute_rel_size(Rel * rel);
+extern int	compute_rel_width(Rel * rel);
+extern int	compute_joinrel_size(JoinPath * joinpath);
+extern int	page_size(int tuples, int width);
 
 /*
  * prototypes for fuctions in clausesel.h--
  *	  routines to compute clause selectivities
  */
-extern void		set_clause_selectivities(List * clauseinfo_list, Cost new_selectivity);
-extern Cost		product_selec(List * clauseinfo_list);
-extern void		set_rest_relselec(Query * root, List * rel_list);
-extern void		set_rest_selec(Query * root, List * clauseinfo_list);
-extern Cost
+extern void set_clause_selectivities(List * clauseinfo_list, Cost new_selectivity);
+extern Cost product_selec(List * clauseinfo_list);
+extern void set_rest_relselec(Query * root, List * rel_list);
+extern void set_rest_selec(Query * root, List * clauseinfo_list);
+extern		Cost
 compute_clause_selec(Query * root,
 					 Node * clause, List * or_selectivities);
 
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index 28f2dd086f7..d9e63a1d8fd 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo.h,v 1.4 1997/09/07 04:58:57 momjian Exp $
+ * $Id: geqo.h,v 1.5 1997/09/08 02:37:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,12 +52,12 @@
 #define SELECTION_BIAS 2.0		/* selective pressure within population */
  /* should be 1.5 <= SELECTION_BIAS <= 2.0 */
 
-int				PoolSize;
-int				Generations;
+int			PoolSize;
+int			Generations;
 
-long			RandomSeed;		/* defaults to (long) time(NULL) in
+long		RandomSeed;			/* defaults to (long) time(NULL) in
 								 * geqo_params.c */
-double			SelectionBias;
+double		SelectionBias;
 
 /* logarithmic base for rel->size decrease in case of long
    queries that cause an integer overflow; used in geqo_eval.c */
@@ -66,13 +66,13 @@ double			SelectionBias;
  /* ^^^						*/
 
 /* geqo prototypes */
-extern Rel	   *geqo(Query * root);
+extern Rel *geqo(Query * root);
 
-extern void		geqo_params(int string_length);
+extern void geqo_params(int string_length);
 
-extern Cost		geqo_eval(Query * root, Gene * tour, int num_gene);
-double			geqo_log(double x, double b);
-extern Rel	   *gimme_tree(Query * root, Gene * tour, int rel_count, int num_gene, Rel * outer_rel);
+extern Cost geqo_eval(Query * root, Gene * tour, int num_gene);
+double		geqo_log(double x, double b);
+extern Rel *gimme_tree(Query * root, Gene * tour, int rel_count, int num_gene, Rel * outer_rel);
 
 
 #endif							/* GEQO_H */
diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h
index 5e1d2f931e1..219f503d914 100644
--- a/src/include/optimizer/geqo_copy.h
+++ b/src/include/optimizer/geqo_copy.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_copy.h,v 1.2 1997/09/07 04:58:58 momjian Exp $
+ * $Id: geqo_copy.h,v 1.3 1997/09/08 02:37:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,6 @@
 #define GEQO_COPY_H
 
 
-extern void		geqo_copy(Chromosome * chromo1, Chromosome * chromo2, int string_length);
+extern void geqo_copy(Chromosome * chromo1, Chromosome * chromo2, int string_length);
 
 #endif							/* GEQO_COPY_H */
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index b3a685e0d77..03634044110 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_gene.h,v 1.2 1997/09/07 04:58:59 momjian Exp $
+ * $Id: geqo_gene.h,v 1.3 1997/09/08 02:37:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,19 +26,19 @@
 /* we presume that int instead of Relid
    is o.k. for Gene; so don't change it! */
 typedef
-int				Gene;
+int			Gene;
 
 typedef struct Chromosome
 {
-	Gene		   *string;
-	Cost			worth;
-}				Chromosome;
+	Gene	   *string;
+	Cost		worth;
+}			Chromosome;
 
 typedef struct Pool
 {
-	Chromosome	   *data;
-	int				size;
-	int				string_length;
-}				Pool;
+	Chromosome *data;
+	int			size;
+	int			string_length;
+}			Pool;
 
 #endif							/* GEQO_GENE_H */
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index d3b72cb3028..83e89698150 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.h,v 1.2 1997/09/07 04:59:00 momjian Exp $
+ * $Id: geqo_misc.h,v 1.3 1997/09/08 02:37:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,12 +23,12 @@
 
 #include <stdio.h>
 
-extern void		print_pool(FILE * fp, Pool * pool, int start, int stop);
-extern void		print_gen(FILE * fp, Pool * pool, int generation);
-extern void		print_edge_table(FILE * fp, Edge * edge_table, int num_gene);
+extern void print_pool(FILE * fp, Pool * pool, int start, int stop);
+extern void print_gen(FILE * fp, Pool * pool, int generation);
+extern void print_edge_table(FILE * fp, Edge * edge_table, int num_gene);
 
-extern void		geqo_print_rel(Query * root, Rel * rel);
-extern void		geqo_print_path(Query * root, Path * path, int indent);
-extern void		geqo_print_joinclauses(Query * root, List * clauses);
+extern void geqo_print_rel(Query * root, Rel * rel);
+extern void geqo_print_path(Query * root, Path * path, int indent);
+extern void geqo_print_joinclauses(Query * root, List * clauses);
 
 #endif							/* GEQO_MISC_H */
diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h
index cc3f613c780..d195ba0c117 100644
--- a/src/include/optimizer/geqo_mutation.h
+++ b/src/include/optimizer/geqo_mutation.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_mutation.h,v 1.2 1997/09/07 04:59:01 momjian Exp $
+ * $Id: geqo_mutation.h,v 1.3 1997/09/08 02:37:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,6 @@
 #define GEQO_MUTATION_H
 
 
-extern void		geqo_mutation(Gene * tour, int num_gene);
+extern void geqo_mutation(Gene * tour, int num_gene);
 
 #endif							/* GEQO_MUTATION_H */
diff --git a/src/include/optimizer/geqo_paths.h b/src/include/optimizer/geqo_paths.h
index 123367ad7e7..b9a9b7e096c 100644
--- a/src/include/optimizer/geqo_paths.h
+++ b/src/include/optimizer/geqo_paths.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_paths.h,v 1.2 1997/09/07 04:59:02 momjian Exp $
+ * $Id: geqo_paths.h,v 1.3 1997/09/08 02:37:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,7 @@
 #define GEQO_PATHS_H
 
 
-extern List    *geqo_prune_rels(List * rel_list);
-extern void		geqo_rel_paths(Rel * rel);
+extern List *geqo_prune_rels(List * rel_list);
+extern void geqo_rel_paths(Rel * rel);
 
 #endif							/* GEQO_PATHS_H */
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index ffcdc0c50bc..2642a8cc3d6 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_pool.h,v 1.2 1997/09/07 04:59:03 momjian Exp $
+ * $Id: geqo_pool.h,v 1.3 1997/09/08 02:37:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,15 +23,15 @@
 #define GEQO_POOL_H
 
 
-extern Pool    *alloc_pool(int pool_size, int string_length);
-extern void		free_pool(Pool * pool);
+extern Pool *alloc_pool(int pool_size, int string_length);
+extern void free_pool(Pool * pool);
 
-extern void		random_init_pool(Query * root, Pool * pool, int strt, int stop);
+extern void random_init_pool(Query * root, Pool * pool, int strt, int stop);
 extern Chromosome *alloc_chromo(int string_length);
-extern void		free_chromo(Chromosome * chromo);
+extern void free_chromo(Chromosome * chromo);
 
-extern void		spread_chromo(Chromosome * chromo, Pool * pool);
+extern void spread_chromo(Chromosome * chromo, Pool * pool);
 
-extern void		sort_pool(Pool * pool);
+extern void sort_pool(Pool * pool);
 
 #endif							/* GEQO_POOL_H */
diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h
index adcd9343f79..0b678504a46 100644
--- a/src/include/optimizer/geqo_recombination.h
+++ b/src/include/optimizer/geqo_recombination.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_recombination.h,v 1.2 1997/09/07 04:59:04 momjian Exp $
+ * $Id: geqo_recombination.h,v 1.3 1997/09/08 02:37:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,24 +24,24 @@
 #define GEQO_RECOMBINATION_H
 
 
-extern void		init_tour(Gene * tour, int num_gene);
+extern void init_tour(Gene * tour, int num_gene);
 
 
 /* edge recombination crossover [ERX] */
 
 typedef struct Edge
 {
-	Gene			edge_list[4];		/* list of edges */
-	int				total_edges;
-	int				unused_edges;
-}				Edge;
+	Gene		edge_list[4];	/* list of edges */
+	int			total_edges;
+	int			unused_edges;
+}			Edge;
 
-extern Edge    *alloc_edge_table(int num_gene);
-extern void		free_edge_table(Edge * edge_table);
+extern Edge *alloc_edge_table(int num_gene);
+extern void free_edge_table(Edge * edge_table);
 
-extern float	gimme_edge_table(Gene * tour1, Gene * tour2, int num_gene, Edge * edge_table);
+extern float gimme_edge_table(Gene * tour1, Gene * tour2, int num_gene, Edge * edge_table);
 
-extern int		gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene);
+extern int	gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene);
 
 
 /* partially matched crossover [PMX] */
@@ -49,31 +49,31 @@ extern int		gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene);
 #define DAD 1					/* indicator for gene from dad */
 #define MOM 0					/* indicator for gene from mom */
 
-extern void		pmx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene);
+extern void pmx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene);
 
 
 typedef struct City
 {
-	int				tour2_position;
-	int				tour1_position;
-	int				used;
-	int				select_list;
-}				City;
+	int			tour2_position;
+	int			tour1_position;
+	int			used;
+	int			select_list;
+}			City;
 
-extern City    *alloc_city_table(int num_gene);
-extern void		free_city_table(City * city_table);
+extern City *alloc_city_table(int num_gene);
+extern void free_city_table(City * city_table);
 
 /* cycle crossover [CX] */
-extern int		cx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table);
+extern int	cx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table);
 
 /* position crossover [PX] */
-extern void		px(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table);
+extern void px(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table);
 
 /* order crossover [OX1] according to Davis */
-extern void		ox1(Gene * mom, Gene * dad, Gene * offspring, int num_gene, City * city_table);
+extern void ox1(Gene * mom, Gene * dad, Gene * offspring, int num_gene, City * city_table);
 
 /* order crossover [OX2] according to Syswerda */
-extern void		ox2(Gene * mom, Gene * dad, Gene * offspring, int num_gene, City * city_table);
+extern void ox2(Gene * mom, Gene * dad, Gene * offspring, int num_gene, City * city_table);
 
 
 #endif							/* GEQO_RECOMBINATION_H */
diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h
index 289fb73083f..910e2048915 100644
--- a/src/include/optimizer/geqo_selection.h
+++ b/src/include/optimizer/geqo_selection.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_selection.h,v 1.2 1997/09/07 04:59:05 momjian Exp $
+ * $Id: geqo_selection.h,v 1.3 1997/09/08 02:37:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,6 @@
 #define GEQO_SELECTION_H
 
 
-extern void		geqo_selection(Chromosome * momma, Chromosome * daddy, Pool * pool, double bias);
+extern void geqo_selection(Chromosome * momma, Chromosome * daddy, Pool * pool, double bias);
 
 #endif							/* GEQO_SELECTION_H */
diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index 3180f2e3a89..958c2b5221f 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.8 1997/09/07 04:59:06 momjian Exp $
+ * $Id: internal.h,v 1.9 1997/09/08 02:37:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,7 +80,7 @@
 #define FLOAT_EQUAL(X,Y) ((X) - (Y) < TOLERANCE)
 #define FLOAT_IS_ZERO(X) (FLOAT_EQUAL(X,0.0))
 
-extern int		BushyPlanFlag;
+extern int	BushyPlanFlag;
 
 /* #define deactivate_joininfo(joininfo)		joininfo->inactive=true*/
 /*#define joininfo_inactive(joininfo)	joininfo->inactive */
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 8294e6cb648..505b6a64c28 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.2 1997/09/07 04:59:07 momjian Exp $
+ * $Id: joininfo.h,v 1.3 1997/09/08 02:37:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef JOININFO_H
 #define JOININFO_H
 
-extern JInfo   *joininfo_member(List * join_relids, List * joininfo_list);
-extern JInfo   *find_joininfo_node(Rel * this_rel, List * join_relids);
-extern Var	   *other_join_clause_var(Var * var, Expr * clause);
+extern JInfo *joininfo_member(List * join_relids, List * joininfo_list);
+extern JInfo *find_joininfo_node(Rel * this_rel, List * join_relids);
+extern Var *other_join_clause_var(Var * var, Expr * clause);
 
 #endif							/* JOININFO_H */
diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h
index e267777c210..cf85d6ef174 100644
--- a/src/include/optimizer/keys.h
+++ b/src/include/optimizer/keys.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: keys.h,v 1.3 1997/09/07 04:59:08 momjian Exp $
+ * $Id: keys.h,v 1.4 1997/09/08 02:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef KEYS_H
 #define KEYS_H
 
-extern bool		match_indexkey_operand(int indexkey, Var * operand, Rel * rel);
-extern Var	   *extract_subkey(JoinKey * jk, int which_subkey);
-extern bool		samekeys(List * keys1, List * keys2);
-extern List    *collect_index_pathkeys(int *index_keys, List * tlist);
+extern bool match_indexkey_operand(int indexkey, Var * operand, Rel * rel);
+extern Var *extract_subkey(JoinKey * jk, int which_subkey);
+extern bool samekeys(List * keys1, List * keys2);
+extern List *collect_index_pathkeys(int *index_keys, List * tlist);
 
 #endif							/* KEYS_H */
diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h
index 7ed360098b7..9d36ac3aaad 100644
--- a/src/include/optimizer/ordering.h
+++ b/src/include/optimizer/ordering.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ordering.h,v 1.4 1997/09/07 04:59:09 momjian Exp $
+ * $Id: ordering.h,v 1.5 1997/09/08 02:37:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,13 +15,13 @@
 
 #include <nodes/relation.h>
 
-extern bool
+extern		bool
 equal_path_path_ordering(PathOrder * path_ordering1,
 						 PathOrder * path_ordering2);
-extern bool
+extern		bool
 equal_path_merge_ordering(Oid * path_ordering,
 						  MergeOrder * merge_ordering);
-extern bool
+extern		bool
 equal_merge_merge_ordering(MergeOrder * merge_ordering1,
 						   MergeOrder * merge_ordering2);
 
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index 9474e1ea8d9..b5538513007 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pathnode.h,v 1.2 1997/09/07 04:59:11 momjian Exp $
+ * $Id: pathnode.h,v 1.3 1997/09/08 02:37:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,12 +16,12 @@
 /*
  * prototypes for pathnode.c
  */
-extern bool		path_is_cheaper(Path * path1, Path * path2);
-extern Path    *set_cheapest(Rel * parent_rel, List * pathlist);
-extern List    *
+extern bool path_is_cheaper(Path * path1, Path * path2);
+extern Path *set_cheapest(Rel * parent_rel, List * pathlist);
+extern List *
 add_pathlist(Rel * parent_rel, List * unique_paths,
 			 List * new_paths);
-extern Path    *create_seqscan_path(Rel * rel);
+extern Path *create_seqscan_path(Rel * rel);
 extern IndexPath *
 create_index_path(Query * root, Rel * rel, Rel * index,
 				  List * restriction_clauses, bool is_join_scan);
@@ -43,13 +43,13 @@ create_hashjoin_path(Rel * joinrel, int outersize,
 /*
  * prototypes for rel.c
  */
-extern Rel	   *rel_member(List * relid, List * rels);
-extern Rel	   *get_base_rel(Query * root, int relid);
-extern Rel	   *get_join_rel(Query * root, List * relid);
+extern Rel *rel_member(List * relid, List * rels);
+extern Rel *get_base_rel(Query * root, int relid);
+extern Rel *get_join_rel(Query * root, List * relid);
 
 /*
  * prototypes for indexnode.h
  */
-extern List    *find_relation_indices(Query * root, Rel * rel);
+extern List *find_relation_indices(Query * root, Rel * rel);
 
 #endif							/* PATHNODE_H */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 841c4983311..c3403e19a04 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.2 1997/09/07 04:59:13 momjian Exp $
+ * $Id: paths.h,v 1.3 1997/09/08 02:37:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,13 +17,13 @@
 /*
  * allpaths.h
  */
-extern List    *find_paths(Query * root, List * rels);
+extern List *find_paths(Query * root, List * rels);
 
 /*
  * indxpath.h
  *	  routines to generate index paths
  */
-extern List    *
+extern List *
 find_index_paths(Query * root, Rel * rel, List * indices,
 				 List * clauseinfo_list,
 				 List * joininfo_list);
@@ -32,19 +32,19 @@ find_index_paths(Query * root, Rel * rel, List * indices,
  * joinpath.h
  *	   routines to create join paths
  */
-extern void		find_all_join_paths(Query * root, List * joinrels);
+extern void find_all_join_paths(Query * root, List * joinrels);
 
 
 /*
  * orindxpath.h
  */
-extern List    *create_or_index_paths(Query * root, Rel * rel, List * clauses);
+extern List *create_or_index_paths(Query * root, Rel * rel, List * clauses);
 
 /*
  * hashutils.h
  *	  routines to deal with hash keys and clauses
  */
-extern List    *
+extern List *
 group_clauses_by_hashop(List * clauseinfo_list,
 						int inner_relid);
 
@@ -52,17 +52,17 @@ group_clauses_by_hashop(List * clauseinfo_list,
  * joinutils.h
  *	  generic join method key/clause routines
  */
-extern List    *
+extern List *
 match_pathkeys_joinkeys(List * pathkeys,
 				   List * joinkeys, List * joinclauses, int which_subkey,
 						List ** matchedJoinClausesPtr);
-extern List    *
+extern List *
 extract_path_keys(List * joinkeys, List * tlist,
 				  int which_subkey);
-extern Path    *
+extern Path *
 match_paths_joinkeys(List * joinkeys, PathOrder * ordering,
 					 List * paths, int which_subkey);
-extern List    *
+extern List *
 new_join_pathkeys(List * outer_pathkeys,
 				  List * join_rel_tlist, List * joinclauses);
 
@@ -70,10 +70,10 @@ new_join_pathkeys(List * outer_pathkeys,
  * mergeutils.h
  *	  routines to deal with merge keys and clauses
  */
-extern List    *
+extern List *
 group_clauses_by_order(List * clauseinfo_list,
 					   int inner_relid);
-extern MInfo   *
+extern MInfo *
 match_order_mergeinfo(PathOrder * ordering,
 					  List * mergeinfo_list);
 
@@ -81,17 +81,17 @@ match_order_mergeinfo(PathOrder * ordering,
  * joinrels.h
  *	  routines to determine which relations to join
  */
-extern List    *find_join_rels(Query * root, List * outer_rels);
-extern void		add_new_joininfos(Query * root, List * joinrels, List * outerrels);
-extern List    *final_join_rels(List * join_rel_list);
+extern List *find_join_rels(Query * root, List * outer_rels);
+extern void add_new_joininfos(Query * root, List * joinrels, List * outerrels);
+extern List *final_join_rels(List * join_rel_list);
 
 /*
  * prototypes for path/prune.c
  */
-extern List    *prune_joinrels(List * rel_list);
-extern void		prune_rel_paths(List * rel_list);
-extern Path    *prune_rel_path(Rel * rel, Path * unorderedpath);
-extern List    *merge_joinrels(List * rel_list1, List * rel_list2);
-extern List    *prune_oldrels(List * old_rels);
+extern List *prune_joinrels(List * rel_list);
+extern void prune_rel_paths(List * rel_list);
+extern Path *prune_rel_path(Rel * rel, Path * unorderedpath);
+extern List *merge_joinrels(List * rel_list1, List * rel_list2);
+extern List *prune_oldrels(List * old_rels);
 
 #endif							/* PATHS_H */
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 1b57c575e15..1a2686e3d31 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plancat.h,v 1.4 1997/09/07 04:59:15 momjian Exp $
+ * $Id: plancat.h,v 1.5 1997/09/08 02:37:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,17 +21,17 @@
  */
 typedef struct IdxInfoRetval
 {
-	Oid				relid;		/* OID of the index relation (not the OID
+	Oid			relid;			/* OID of the index relation (not the OID
 								 * of the relation being indexed) */
-	Oid				relam;		/* OID of the pg_am of this index */
-	int				pages;		/* number of pages in the index relation */
-	int				tuples;		/* number of tuples in the index relation */
-	int			   *indexkeys;	/* keys over which we're indexing */
-	Oid			   *orderOprs;	/* operators used for ordering purposes */
-	Oid			   *classlist;	/* classes of AM operators */
-	Oid				indproc;
-	Node		   *indpred;
-}				IdxInfoRetval;
+	Oid			relam;			/* OID of the pg_am of this index */
+	int			pages;			/* number of pages in the index relation */
+	int			tuples;			/* number of tuples in the index relation */
+	int		   *indexkeys;		/* keys over which we're indexing */
+	Oid		   *orderOprs;		/* operators used for ordering purposes */
+	Oid		   *classlist;		/* classes of AM operators */
+	Oid			indproc;
+	Node	   *indpred;
+}			IdxInfoRetval;
 
 
 extern void
@@ -40,11 +40,11 @@ relation_info(Query * root,
 			  bool * hashindex, int *pages,
 			  int *tuples);
 
-extern bool
+extern		bool
 index_info(Query * root,
 		   bool first, int relid, IdxInfoRetval * info);
 
-extern			Cost
+extern		Cost
 restriction_selectivity(Oid functionObjectId,
 						Oid operatorObjectId,
 						Oid relationObjectId,
@@ -57,12 +57,12 @@ index_selectivity(Oid indid, Oid * classes, List * opnos,
 				  Oid relid, List * attnos, List * values, List * flags,
 				  int32 nkeys, float *idxPages, float *idxSelec);
 
-extern Cost
+extern		Cost
 join_selectivity(Oid functionObjectId, Oid operatorObjectId,
 				 Oid relationObjectId1, AttrNumber attributeNumber1,
 				 Oid relationObjectId2, AttrNumber attributeNumber2);
 
-extern List    *find_inheritance_children(Oid inhparent);
-extern List    *VersionGetParents(Oid verrelid);
+extern List *find_inheritance_children(Oid inhparent);
+extern List *VersionGetParents(Oid verrelid);
 
 #endif							/* PLANCAT_H */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 9c8abc450d2..2d9c41391a8 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.2 1997/09/07 04:59:17 momjian Exp $
+ * $Id: planmain.h,v 1.3 1997/09/08 02:37:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 /*
  * prototypes for plan/planmain.c
  */
-extern Plan    *
+extern Plan *
 query_planner(Query * root,
 			  int command_type, List * tlist, List * qual);
 
@@ -25,42 +25,42 @@ query_planner(Query * root,
 /*
  * prototypes for plan/createplan.c
  */
-extern Plan    *create_plan(Path * best_path);
+extern Plan *create_plan(Path * best_path);
 extern SeqScan *
 make_seqscan(List * qptlist, List * qpqual, Index scanrelid,
 			 Plan * lefttree);
-extern Sort    *
+extern Sort *
 make_sort(List * tlist, Oid tempid, Plan * lefttree,
 		  int keycount);
-extern Agg	   *make_agg(List * tlist, int nagg, Aggreg ** aggs);
-extern Group   *
+extern Agg *make_agg(List * tlist, int nagg, Aggreg ** aggs);
+extern Group *
 make_group(List * tlist, bool tuplePerGroup, int ngrp,
 		   AttrNumber * grpColIdx, Sort * lefttree);
-extern Unique  *make_unique(List * tlist, Plan * lefttree, char *uniqueAttr);
-extern List    *generate_fjoin(List * tlist);
+extern Unique *make_unique(List * tlist, Plan * lefttree, char *uniqueAttr);
+extern List *generate_fjoin(List * tlist);
 
 
 /*
  * prototypes for plan/initsplan.c
  */
-extern void		initialize_base_rels_list(Query * root, List * tlist);
-extern void		initialize_base_rels_jinfo(Query * root, List * clauses);
-extern void		initialize_join_clause_info(List * rel_list);
-extern void		add_missing_vars_to_base_rels(Query * root, List * tlist);
+extern void initialize_base_rels_list(Query * root, List * tlist);
+extern void initialize_base_rels_jinfo(Query * root, List * clauses);
+extern void initialize_join_clause_info(List * rel_list);
+extern void add_missing_vars_to_base_rels(Query * root, List * tlist);
 
 /*
  * prototypes for plan/setrefs.c
  */
-extern void		set_tlist_references(Plan * plan);
-extern List    *
+extern void set_tlist_references(Plan * plan);
+extern List *
 join_references(List * clauses, List * outer_tlist,
 				List * inner_tlist);
-extern List    *
+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_result_tlist_references(Result * resultNode);
+extern void set_agg_tlist_references(Agg * aggNode);
+extern void set_agg_agglist_references(Agg * aggNode);
 
 
 #endif							/* PLANMAIN_H */
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index d8f7be50e6f..9f0375a599e 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planner.h,v 1.3 1997/09/07 04:59:18 momjian Exp $
+ * $Id: planner.h,v 1.4 1997/09/08 02:37:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 /*
 */
 
-extern Plan    *planner(Query * parse);
-extern void		pg_checkretval(Oid rettype, QueryTreeList * querytree_list);
+extern Plan *planner(Query * parse);
+extern void pg_checkretval(Oid rettype, QueryTreeList * querytree_list);
 
 #endif							/* PLANNER_H */
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index 6e408a84173..ccc721495b2 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prep.h,v 1.3 1997/09/07 04:59:18 momjian Exp $
+ * $Id: prep.h,v 1.4 1997/09/08 02:37:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,21 +19,21 @@
 /*
  * prototypes for archive.h
  */
-extern void		plan_archive(List * rt);
-extern List    *find_archive_rels(Oid relid);
+extern void plan_archive(List * rt);
+extern List *find_archive_rels(Oid relid);
 
 /*
  * prototypes for prepqual.h
  */
-extern List    *
+extern List *
 preprocess_qualification(Expr * qual, List * tlist,
 						 List ** existentialQualPtr);
-extern List    *cnfify(Expr * qual, bool removeAndFlag);
+extern List *cnfify(Expr * qual, bool removeAndFlag);
 
 /*
  * prototypes for preptlist.h
  */
-extern List    *
+extern List *
 preprocess_targetlist(List * tlist, int command_type,
 					  Index result_relation, List * range_table);
 
@@ -43,13 +43,13 @@ preprocess_targetlist(List * tlist, int command_type,
 typedef enum UnionFlag
 {
 	INHERITS_FLAG, ARCHIVE_FLAG, VERSION_FLAG
-}				UnionFlag;
+}			UnionFlag;
 
-extern List    *
+extern List *
 find_all_inheritors(List * unexamined_relids,
 					List * examined_relids);
-extern int		first_matching_rt_entry(List * rangetable, UnionFlag flag);
-extern Append  *
+extern int	first_matching_rt_entry(List * rangetable, UnionFlag flag);
+extern Append *
 plan_union_queries(Index rt_index, Query * parse,
 				   UnionFlag flag);
 
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index e83c1d10677..99299db7571 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -6,30 +6,30 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.3 1997/09/07 04:59:19 momjian Exp $
+ * $Id: tlist.h,v 1.4 1997/09/08 02:37:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TLIST_H
 #define TLIST_H
 
-extern int		exec_tlist_length(List * targelist);
+extern int	exec_tlist_length(List * targelist);
 extern TargetEntry *tlistentry_member(Var * var, List * targetlist);
-extern Expr    *matching_tlvar(Var * var, List * targetlist);
-extern void		add_tl_element(Rel * rel, Var * var);
+extern Expr *matching_tlvar(Var * var, List * targetlist);
+extern void add_tl_element(Rel * rel, Var * var);
 extern TargetEntry *create_tl_element(Var * var, int resdomno);
-extern List    *get_actual_tlist(List * tlist);
-extern Resdom  *tlist_member(Var * var, List * tlist);
-extern Resdom  *tlist_resdom(List * tlist, Resdom * resnode);
+extern List *get_actual_tlist(List * tlist);
+extern Resdom *tlist_member(Var * var, List * tlist);
+extern Resdom *tlist_resdom(List * tlist, Resdom * resnode);
 
 extern TargetEntry *MakeTLE(Resdom * resdom, Node * expr);
-extern Var	   *get_expr(TargetEntry * tle);
+extern Var *get_expr(TargetEntry * tle);
 
 extern TargetEntry *match_varid(Var * test_var, List * tlist);
-extern List    *new_unsorted_tlist(List * targetlist);
-extern List    *copy_vars(List * target, List * source);
-extern List    *flatten_tlist(List * tlist);
-extern List    *
+extern List *new_unsorted_tlist(List * targetlist);
+extern List *copy_vars(List * target, List * source);
+extern List *flatten_tlist(List * tlist);
+extern List *
 flatten_tlist_vars(List * full_tlist,
 				   List * flat_tlist);
 
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index 519b6957249..372e5a27a8c 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: var.h,v 1.2 1997/09/07 04:59:23 momjian Exp $
+ * $Id: var.h,v 1.3 1997/09/08 02:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VAR_H
 #define VAR_H
 
-extern List    *pull_varnos(Node * me);
-extern bool		contain_var_clause(Node * clause);
-extern List    *pull_var_clause(Node * clause);
-extern bool		var_equal(Var * var1, Var * var2);
+extern List *pull_varnos(Node * me);
+extern bool contain_var_clause(Node * clause);
+extern List *pull_var_clause(Node * clause);
+extern bool var_equal(Var * var1, Var * var2);
 
 #endif							/* VAR_H */
diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h
index a608771effb..b8232db4f7a 100644
--- a/src/include/optimizer/xfunc.h
+++ b/src/include/optimizer/xfunc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xfunc.h,v 1.3 1997/09/07 04:59:26 momjian Exp $
+ * $Id: xfunc.h,v 1.4 1997/09/08 02:37:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@
 #define XFUNC_JOINPRD 2
 #define XFUNC_UNKNOWN 0
 
-extern int		XfuncMode;		/* defined in tcop/postgres.c */
+extern int	XfuncMode;			/* defined in tcop/postgres.c */
 
 /* defaults for function attributes used for expensive function calculations */
 #define BYTE_PCT 100
@@ -49,42 +49,42 @@ extern int		XfuncMode;		/* defined in tcop/postgres.c */
 #define is_join(pathnode) (length(get_relids(get_parent(pathnode))) > 1 ? 1 : 0)
 
 /* function prototypes from planner/path/xfunc.c */
-extern void		xfunc_trypullup(Rel * rel);
+extern void xfunc_trypullup(Rel * rel);
 extern int
 xfunc_shouldpull(Path * childpath, JoinPath * parentpath,
 				 int whichchild, CInfo * maxcinfopt);
-extern CInfo   *
+extern CInfo *
 xfunc_pullup(Path * childpath, JoinPath * parentpath, CInfo * cinfo,
 			 int whichchild, int clausetype);
-extern Cost		xfunc_rank(Expr * clause);
-extern Cost		xfunc_expense(Query * queryInfo, Expr * clause);
-extern Cost		xfunc_join_expense(JoinPath * path, int whichchild);
-extern Cost		xfunc_local_expense(Expr * clause);
-extern Cost		xfunc_func_expense(Expr * node, List * args);
-extern int		xfunc_width(Expr * clause);
+extern Cost xfunc_rank(Expr * clause);
+extern Cost xfunc_expense(Query * queryInfo, Expr * clause);
+extern Cost xfunc_join_expense(JoinPath * path, int whichchild);
+extern Cost xfunc_local_expense(Expr * clause);
+extern Cost xfunc_func_expense(Expr * node, List * args);
+extern int	xfunc_width(Expr * clause);
 
 /* static, moved to xfunc.c */
 /* extern int xfunc_card_unreferenced(Expr *clause, Relid referenced); */
-extern int		xfunc_card_product(Relid relids);
-extern List    *xfunc_find_references(List * clause);
-extern List    *xfunc_primary_join(JoinPath * pathnode);
-extern Cost		xfunc_get_path_cost(Path * pathnode);
-extern Cost		xfunc_total_path_cost(JoinPath * pathnode);
-extern Cost		xfunc_expense_per_tuple(JoinPath * joinnode, int whichchild);
-extern void		xfunc_fixvars(Expr * clause, Rel * rel, int varno);
-extern int		xfunc_cinfo_compare(void *arg1, void *arg2);
-extern int		xfunc_clause_compare(void *arg1, void *arg2);
-extern void		xfunc_disjunct_sort(List * clause_list);
-extern int		xfunc_disjunct_compare(void *arg1, void *arg2);
-extern int		xfunc_func_width(RegProcedure funcid, List * args);
-extern int		xfunc_tuple_width(Relation rd);
-extern int		xfunc_num_join_clauses(JoinPath * path);
-extern List    *xfunc_LispRemove(List * foo, List * bar);
-extern bool		xfunc_copyrel(Rel * from, Rel ** to);
+extern int	xfunc_card_product(Relid relids);
+extern List *xfunc_find_references(List * clause);
+extern List *xfunc_primary_join(JoinPath * pathnode);
+extern Cost xfunc_get_path_cost(Path * pathnode);
+extern Cost xfunc_total_path_cost(JoinPath * pathnode);
+extern Cost xfunc_expense_per_tuple(JoinPath * joinnode, int whichchild);
+extern void xfunc_fixvars(Expr * clause, Rel * rel, int varno);
+extern int	xfunc_cinfo_compare(void *arg1, void *arg2);
+extern int	xfunc_clause_compare(void *arg1, void *arg2);
+extern void xfunc_disjunct_sort(List * clause_list);
+extern int	xfunc_disjunct_compare(void *arg1, void *arg2);
+extern int	xfunc_func_width(RegProcedure funcid, List * args);
+extern int	xfunc_tuple_width(Relation rd);
+extern int	xfunc_num_join_clauses(JoinPath * path);
+extern List *xfunc_LispRemove(List * foo, List * bar);
+extern bool xfunc_copyrel(Rel * from, Rel ** to);
 
 /*
  * function prototypes for path/predmig.c
  */
-extern bool		xfunc_do_predmig(Path root);
+extern bool xfunc_do_predmig(Path root);
 
 #endif							/* XFUNC_H */
diff --git a/src/include/parser/catalog_utils.h b/src/include/parser/catalog_utils.h
index dd2241e19e0..0a449713122 100644
--- a/src/include/parser/catalog_utils.h
+++ b/src/include/parser/catalog_utils.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catalog_utils.h,v 1.11 1997/09/07 04:59:27 momjian Exp $
+ * $Id: catalog_utils.h,v 1.12 1997/09/08 02:38:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,36 +19,36 @@
 typedef HeapTuple Type;
 typedef HeapTuple Operator;
 
-extern Type		get_id_type(Oid id);
-extern char    *get_id_typname(Oid id);
-extern Type		type(char *);
-extern Oid		att_typeid(Relation rd, int attid);
-extern int		att_attnelems(Relation rd, int attid);
-extern Oid		typeid(Type tp);
-extern int16	tlen(Type t);
-extern bool		tbyval(Type t);
-extern char    *tname(Type t);
-extern int		tbyvalue(Type t);
-extern Oid		oprid(Operator op);
+extern Type get_id_type(Oid id);
+extern char *get_id_typname(Oid id);
+extern Type type(char *);
+extern Oid	att_typeid(Relation rd, int attid);
+extern int	att_attnelems(Relation rd, int attid);
+extern Oid	typeid(Type tp);
+extern int16 tlen(Type t);
+extern bool tbyval(Type t);
+extern char *tname(Type t);
+extern int	tbyvalue(Type t);
+extern Oid	oprid(Operator op);
 extern Operator oper(char *op, Oid arg1, Oid arg2, bool noWarnings);
 extern Operator right_oper(char *op, Oid arg);
 extern Operator left_oper(char *op, Oid arg);
-extern int		varattno(Relation rd, char *a);
-extern bool		varisset(Relation rd, char *name);
-extern int		nf_varattno(Relation rd, char *a);
-extern char    *getAttrName(Relation rd, int attrno);
-extern char    *instr2(Type tp, char *string, int typlen);
-extern Oid		GetArrayElementType(Oid typearray);
-extern Oid		funcid_get_rettype(Oid funcid);
-extern bool
+extern int	varattno(Relation rd, char *a);
+extern bool varisset(Relation rd, char *name);
+extern int	nf_varattno(Relation rd, char *a);
+extern char *getAttrName(Relation rd, int attrno);
+extern char *instr2(Type tp, char *string, int typlen);
+extern Oid	GetArrayElementType(Oid typearray);
+extern Oid	funcid_get_rettype(Oid funcid);
+extern		bool
 func_get_detail(char *funcname, int nargs, Oid * oid_array,
 		Oid * funcid, Oid * rettype, bool * retset, Oid ** true_typeids);
-extern Oid		typeid_get_retinfunc(Oid type_id);
-extern Oid		typeid_get_retoutfunc(Oid type_id);
-extern Oid		typeid_get_relid(Oid type_id);
-extern Oid		get_typrelid(Type typ);
-extern Oid		get_typelem(Oid type_id);
-extern void		func_error(char *caller, char *funcname, int nargs, Oid * argtypes);
-extern void		agg_error(char *caller, char *aggname, Oid basetypeID);
+extern Oid	typeid_get_retinfunc(Oid type_id);
+extern Oid	typeid_get_retoutfunc(Oid type_id);
+extern Oid	typeid_get_relid(Oid type_id);
+extern Oid	get_typrelid(Type typ);
+extern Oid	get_typelem(Oid type_id);
+extern void func_error(char *caller, char *funcname, int nargs, Oid * argtypes);
+extern void agg_error(char *caller, char *aggname, Oid basetypeID);
 
 #endif							/* CATALOG_UTILS_H */
diff --git a/src/include/parser/dbcommands.h b/src/include/parser/dbcommands.h
index 4a7f32225ca..76b1dc6a0ee 100644
--- a/src/include/parser/dbcommands.h
+++ b/src/include/parser/dbcommands.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dbcommands.h,v 1.3 1997/09/07 04:59:29 momjian Exp $
+ * $Id: dbcommands.h,v 1.4 1997/09/08 02:38:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 #define SIGKILLDAEMON1	SIGINT
 #define SIGKILLDAEMON2	SIGTERM
 
-extern void		createdb(char *dbname);
-extern void		destroydb(char *dbname);
+extern void createdb(char *dbname);
+extern void destroydb(char *dbname);
 
 #endif							/* DBCOMMANDS_H */
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index 67ed5940f27..96168936851 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: gramparse.h,v 1.3 1997/09/07 04:59:31 momjian Exp $
+ * $Id: gramparse.h,v 1.4 1997/09/08 02:38:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,10 @@
 #define GRAMPARSE_H				/* include once only */
 
 /* from scan.l */
-extern void		init_io(void);
+extern void init_io(void);
 
 /* from gram.y */
-extern void		parser_init(Oid * typev, int nargs);
-extern int		yyparse(void);
+extern void parser_init(Oid * typev, int nargs);
+extern int	yyparse(void);
 
 #endif							/* GRAMPARSE_H */
diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h
index 1453d60e1a4..9d459cda8ad 100644
--- a/src/include/parser/keywords.h
+++ b/src/include/parser/keywords.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: keywords.h,v 1.2 1997/09/07 04:59:34 momjian Exp $
+ * $Id: keywords.h,v 1.3 1997/09/08 02:38:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,11 +16,11 @@
 
 typedef struct ScanKeyword
 {
-	char		   *name;
-	int				value;
-}				ScanKeyword;
+	char	   *name;
+	int			value;
+}			ScanKeyword;
 
 extern ScanKeyword *ScanKeywordLookup(char *text);
-extern char    *AtomValueGetString(int atomval);
+extern char *AtomValueGetString(int atomval);
 
 #endif							/* KEYWORDS_H */
diff --git a/src/include/parser/parse_query.h b/src/include/parser/parse_query.h
index decf425ca92..63310a8bd72 100644
--- a/src/include/parser/parse_query.h
+++ b/src/include/parser/parse_query.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_query.h,v 1.10 1997/09/07 04:59:36 momjian Exp $
+ * $Id: parse_query.h,v 1.11 1997/09/08 02:38:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,44 +19,44 @@
 
 typedef struct QueryTreeList
 {
-	int				len;		/* number of queries */
-	Query		  **qtrees;
-}				QueryTreeList;
+	int			len;			/* number of queries */
+	Query	  **qtrees;
+}			QueryTreeList;
 
 extern RangeTblEntry *refnameRangeTableEntry(List * rtable, char *refname);
 extern RangeTblEntry *colnameRangeTableEntry(ParseState * pstate, char *colname);
-extern int		refnameRangeTablePosn(List * rtable, char *refname);
+extern int	refnameRangeTablePosn(List * rtable, char *refname);
 extern RangeTblEntry *
 addRangeTableEntry(ParseState * pstate,
 				   char *relname, char *refname,
 				   bool inh, bool inFromCl,
 				   TimeRange * timeRange);
-extern List    *
+extern List *
 expandAll(ParseState * pstate, char *relname, char *refname,
 		  int *this_resno);
-extern TimeQual
+extern		TimeQual
 makeTimeRange(char *datestring1, char *datestring2,
 			  int timecode);
-extern Expr    *make_op(char *opname, Node * ltree, Node * rtree);
+extern Expr *make_op(char *opname, Node * ltree, Node * rtree);
 
-extern Oid		find_atttype(Oid relid, char *attrname);
-extern Var	   *
+extern Oid	find_atttype(Oid relid, char *attrname);
+extern Var *
 make_var(ParseState * pstate,
 		 char *relname, char *attrname, Oid * type_id);
 extern ArrayRef *make_array_ref(Node * array, List * indirection);
 extern ArrayRef *
 make_array_set(Expr * target_expr, List * upperIndexpr,
 			   List * lowerIndexpr, Expr * expr);
-extern Const   *make_const(Value * value);
+extern Const *make_const(Value * value);
 
-extern void		param_type_init(Oid * typev, int nargs);
-extern Oid		param_type(int t);
+extern void param_type_init(Oid * typev, int nargs);
+extern Oid	param_type(int t);
 
 /* parser.c (was ylib.c) */
 extern QueryTreeList *parser(char *str, Oid * typev, int nargs);
-extern Node    *parser_typecast(Value * expr, TypeName * typename, int typlen);
-extern Node    *parser_typecast2(Node * expr, Oid exprType, Type tp, int typlen);
-extern Aggreg  *ParseAgg(char *aggname, Oid basetype, Node * target);
+extern Node *parser_typecast(Value * expr, TypeName * typename, int typlen);
+extern Node *parser_typecast2(Node * expr, Oid exprType, Type tp, int typlen);
+extern Aggreg *ParseAgg(char *aggname, Oid basetype, Node * target);
 extern void
 handleTargetColname(ParseState * pstate, char **resname,
 					char *refname, char *colname);
@@ -65,12 +65,12 @@ handleTargetColname(ParseState * pstate, char **resname,
  * analyze.c
  */
 
-Oid				exprType(Node * expr);
-QueryTreeList  *parse_analyze(List * querytree_list);
+Oid			exprType(Node * expr);
+QueryTreeList *parse_analyze(List * querytree_list);
 
 /* define in parse_query.c, used in gram.y */
-extern Oid	   *param_type_info;
-extern int		pfunc_num_args;
+extern Oid *param_type_info;
+extern int	pfunc_num_args;
 
 /* useful macros */
 #define ISCOMPLEX(type) (typeid_get_relid(type) ? true : false)
diff --git a/src/include/parser/parse_state.h b/src/include/parser/parse_state.h
index 05f860290fb..ce41c6cd769 100644
--- a/src/include/parser/parse_state.h
+++ b/src/include/parser/parse_state.h
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_state.h,v 1.6 1997/09/07 04:59:37 momjian Exp $
+ * $Id: parse_state.h,v 1.7 1997/09/08 02:38:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,17 +18,17 @@
 /* state information used during parse analysis */
 typedef struct ParseState
 {
-	int				p_last_resno;
-	List		   *p_rtable;
-	int				p_numAgg;
-	List		   *p_aggs;
-	bool			p_is_insert;
-	List		   *p_insert_columns;
-	bool			p_is_update;
-	bool			p_is_rule;
-	Relation		p_target_relation;
-	RangeTblEntry  *p_target_rangetblentry;
-}				ParseState;
+	int			p_last_resno;
+	List	   *p_rtable;
+	int			p_numAgg;
+	List	   *p_aggs;
+	bool		p_is_insert;
+	List	   *p_insert_columns;
+	bool		p_is_update;
+	bool		p_is_rule;
+	Relation	p_target_relation;
+	RangeTblEntry *p_target_rangetblentry;
+}			ParseState;
 
 
 #endif							/* PARSE_QUERY_H */
diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h
index e3dd13a6064..660a63db4ea 100644
--- a/src/include/parser/scansup.h
+++ b/src/include/parser/scansup.h
@@ -6,9 +6,9 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: scansup.h,v 1.2 1997/09/07 04:59:39 momjian Exp $
+ * $Id: scansup.h,v 1.3 1997/09/08 02:38:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-extern char    *scanstr(char *s);
+extern char *scanstr(char *s);
diff --git a/src/include/parser/sysfunc.h b/src/include/parser/sysfunc.h
index 2a1f87d8590..6ba643c005c 100644
--- a/src/include/parser/sysfunc.h
+++ b/src/include/parser/sysfunc.h
@@ -6,4 +6,4 @@
  * -------------------------------------------------------------------------
  */
 
-extern char    *SystemFunctionHandler(char *funct);
+extern char *SystemFunctionHandler(char *funct);
diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h
index ec0859e521c..447b8ee4427 100644
--- a/src/include/port/hpux.h
+++ b/src/include/port/hpux.h
@@ -3,8 +3,8 @@
 #define HAS_TEST_AND_SET
 typedef struct
 {
-	int				sem[4];
-}				slock_t;
+	int			sem[4];
+}			slock_t;
 
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
diff --git a/src/include/port/nextstep.h b/src/include/port/nextstep.h
index f893b48b03c..d0b43d57163 100644
--- a/src/include/port/nextstep.h
+++ b/src/include/port/nextstep.h
@@ -3,11 +3,11 @@
 #if defined(__STRICT_ANSI__)
 #define isascii(c)	((unsigned)(c)<=0177)
 #endif
-extern char    *strdup(const char *string);
+extern char *strdup(const char *string);
 
 #ifndef _POSIX_SOURCE
 typedef unsigned short mode_t;
-typedef int		sigset_t;
+typedef int sigset_t;
 
 #define SIG_BLOCK	  00
 #define SIG_UNBLOCK   01
diff --git a/src/include/port/ultrix4.h b/src/include/port/ultrix4.h
index 87678df9ba2..872583bfa42 100644
--- a/src/include/port/ultrix4.h
+++ b/src/include/port/ultrix4.h
@@ -26,48 +26,48 @@
 #include <sys/types.h>			/* Declare various types, e.g. size_t,
 								 * fd_set */
 
-extern int		strcasecmp(const char *, const char *);
-extern void		bzero(void *, size_t);
+extern int	strcasecmp(const char *, const char *);
+extern void bzero(void *, size_t);
 
-extern int		fp_class_d(double);
-extern long		random(void);
+extern int	fp_class_d(double);
+extern long random(void);
 
 struct rusage;
-extern int		getrusage(int, struct rusage *);
+extern int	getrusage(int, struct rusage *);
 
-extern int		ioctl(int, unsigned long,...);
+extern int	ioctl(int, unsigned long,...);
 
-extern int		socket(int, int, int);
+extern int	socket(int, int, int);
 struct sockaddr;
-extern int		connect(int, const struct sockaddr *, int);
-typedef int		ssize_t;
-extern ssize_t	send(int, const void *, size_t, int);
-extern ssize_t	recv(int, void *, size_t, int);
-extern int		setsockopt(int, int, int, const void *, int);
-extern int		bind(int, const struct sockaddr *, int);
-extern int		listen(int, int);
-extern int		accept(int, struct sockaddr *, int *);
-extern int		getsockname(int, struct sockaddr *, int *);
-extern ssize_t	recvfrom(int, void *, size_t, int, struct sockaddr *, int *);
-extern ssize_t	sendto(int, const void *, size_t, int, const struct sockaddr *, int);
+extern int	connect(int, const struct sockaddr *, int);
+typedef int ssize_t;
+extern ssize_t send(int, const void *, size_t, int);
+extern ssize_t recv(int, void *, size_t, int);
+extern int	setsockopt(int, int, int, const void *, int);
+extern int	bind(int, const struct sockaddr *, int);
+extern int	listen(int, int);
+extern int	accept(int, struct sockaddr *, int *);
+extern int	getsockname(int, struct sockaddr *, int *);
+extern ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, int *);
+extern ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *, int);
 struct timeval;
-extern int		select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+extern int	select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
 
-extern int		gethostname(char *, int);
+extern int	gethostname(char *, int);
 
-extern int		getopt(int, char *const *, const char *);
-extern int		putenv(const char *);
+extern int	getopt(int, char *const *, const char *);
+extern int	putenv(const char *);
 
-extern pid_t	vfork(void);
+extern pid_t vfork(void);
 
 struct itimerval;
-extern int		setitimer(int, const struct itimerval *, struct itimerval *);
+extern int	setitimer(int, const struct itimerval *, struct itimerval *);
 struct timezone;
-extern int		gettimeofday(struct timeval *, struct timezone *);
+extern int	gettimeofday(struct timeval *, struct timezone *);
 
-extern int		fsync(int);
-extern int		ftruncate(int, off_t);
+extern int	fsync(int);
+extern int	ftruncate(int, off_t);
 
-extern char    *crypt(char *, char *);
+extern char *crypt(char *, char *);
 
 /* End of ultrix4.h */
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index c0bc9821867..4acd2b1a752 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -9,10 +9,10 @@ typedef unsigned char slock_t;
 
 #endif
 
-extern long		random(void);
-extern void		srandom(int seed);
-extern int		strcasecmp(char *s1, char *s2);
-extern int		gethostname(char *name, int namelen);
+extern long random(void);
+extern void srandom(int seed);
+extern int	strcasecmp(char *s1, char *s2);
+extern int	gethostname(char *name, int namelen);
 
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 2e37eb95fd7..706dcc1a41b 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1995, Regents of the University of California
  *
- * $Id: postgres.h,v 1.7 1997/09/07 04:55:39 momjian Exp $
+ * $Id: postgres.h,v 1.8 1997/09/08 02:33:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,22 +47,22 @@
  * ----------------------------------------------------------------
  */
 
-typedef int16	int2;
-typedef int32	int4;
-typedef float	float4;
-typedef double	float8;
+typedef int16 int2;
+typedef int32 int4;
+typedef float float4;
+typedef double float8;
 
-typedef int4	aclitem;
+typedef int4 aclitem;
 
 #define InvalidOid		0
 #define OidIsValid(objectId)  ((bool) (objectId != InvalidOid))
 
 /* unfortunately, both regproc and RegProcedure are used */
-typedef Oid		regproc;
-typedef Oid		RegProcedure;
+typedef Oid regproc;
+typedef Oid RegProcedure;
 
 /* ptr to func returning (char *) */
-typedef char   *((*func_ptr) ());
+typedef char *((*func_ptr) ());
 
 
 #define RegProcedureIsValid(p)	OidIsValid(p)
@@ -77,8 +77,8 @@ typedef char   *((*func_ptr) ());
  */
 struct varlena
 {
-	int32			vl_len;
-	char			vl_dat[1];
+	int32		vl_len;
+	char		vl_dat[1];
 };
 
 #define VARSIZE(PTR)	(((struct varlena *)(PTR))->vl_len)
@@ -90,8 +90,8 @@ typedef struct varlena text;
 
 typedef struct char8
 {
-	char			data[8];
-}				char8;
+	char		data[8];
+}			char8;
 
 /* ----------------
  *		char16
@@ -99,18 +99,18 @@ typedef struct char8
  */
 typedef struct char16
 {
-	char			data[16];
-}				char16;
+	char		data[16];
+}			char16;
 
 typedef char16 *Char16;
 
-typedef int2	int28[8];
-typedef Oid		oid8[8];
+typedef int2 int28[8];
+typedef Oid oid8[8];
 
 typedef struct nameData
 {
-	char			data[NAMEDATALEN];
-}				NameData;
+	char		data[NAMEDATALEN];
+}			NameData;
 typedef NameData *Name;
 
 /* ----------------
@@ -121,9 +121,9 @@ typedef NameData *Name;
  */
 typedef struct OidInt4Data
 {
-	Oid				oi_oid;
-	int32			oi_int4;
-}				OidInt4Data;
+	Oid			oi_oid;
+	int32		oi_int4;
+}			OidInt4Data;
 
 typedef struct OidInt4Data *OidInt4;
 
@@ -135,9 +135,9 @@ typedef struct OidInt4Data *OidInt4;
  */
 typedef struct OidInt2Data
 {
-	Oid				oi_oid;
-	int16			oi_int2;
-}				OidInt2Data;
+	Oid			oi_oid;
+	int16		oi_int2;
+}			OidInt2Data;
 
 typedef struct OidInt2Data *OidInt2;
 
@@ -149,9 +149,9 @@ typedef struct OidInt2Data *OidInt2;
  */
 typedef struct OidNameData
 {
-	Oid				id;
-	NameData		name;
-}				OidNameData;
+	Oid			id;
+	NameData	name;
+}			OidNameData;
 
 typedef struct OidNameData *OidName;
 
@@ -160,10 +160,10 @@ typedef struct OidNameData *OidName;
  * ----------------------------------------------------------------
  */
 
-typedef uint32	TransactionId;
+typedef uint32 TransactionId;
 
 #define InvalidTransactionId	0
-typedef uint16	CommandId;
+typedef uint16 CommandId;
 
 #define FirstCommandId	0
 
diff --git a/src/include/regex/cclass.h b/src/include/regex/cclass.h
index 271d1e418e6..2ab5eca33f5 100644
--- a/src/include/regex/cclass.h
+++ b/src/include/regex/cclass.h
@@ -40,10 +40,10 @@
 /* character-class table */
 static struct cclass
 {
-	char		   *name;
-	char		   *chars;
-	char		   *multis;
-}				cclasses[] =
+	char	   *name;
+	char	   *chars;
+	char	   *multis;
+}			cclasses[] =
 
 {
 	{
diff --git a/src/include/regex/cname.h b/src/include/regex/cname.h
index 8cf78f7cbe5..a333e9c4e5e 100644
--- a/src/include/regex/cname.h
+++ b/src/include/regex/cname.h
@@ -40,9 +40,9 @@
 /* character-name table */
 static struct cname
 {
-	char		   *name;
-	char			code;
-}				cnames[] =
+	char	   *name;
+	char		code;
+}			cnames[] =
 
 {
 	{
diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index 18b39768849..94b3ea4a2d8 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -43,21 +43,21 @@
 #include <sys/types.h>
 
 /* types */
-typedef off_t	regoff_t;
+typedef off_t regoff_t;
 
 typedef struct
 {
-	int				re_magic;
-	size_t			re_nsub;	/* number of parenthesized subexpressions */
-	const char	   *re_endp;	/* end pointer for REG_PEND */
+	int			re_magic;
+	size_t		re_nsub;		/* number of parenthesized subexpressions */
+	const char *re_endp;		/* end pointer for REG_PEND */
 	struct re_guts *re_g;		/* none of your business :-) */
-}				regex_t;
+}			regex_t;
 
 typedef struct
 {
-	regoff_t		rm_so;		/* start of match */
-	regoff_t		rm_eo;		/* end of match */
-}				regmatch_t;
+	regoff_t	rm_so;			/* start of match */
+	regoff_t	rm_eo;			/* end of match */
+}			regmatch_t;
 
 /* regcomp() flags */
 #define REG_BASIC		0000
@@ -97,11 +97,11 @@ typedef struct
 #define REG_LARGE		01000	/* force large representation */
 #define REG_BACKR		02000	/* force use of backref code */
 
-int				pg95_regcomp(regex_t *, const char *, int);
-size_t			pg95_regerror(int, const regex_t *, char *, size_t);
+int			pg95_regcomp(regex_t *, const char *, int);
+size_t		pg95_regerror(int, const regex_t *, char *, size_t);
 int
 pg95_regexec(const regex_t *,
 			 const char *, size_t, regmatch_t[], int);
-void			pg95_regfree(regex_t *);
+void		pg95_regfree(regex_t *);
 
 #endif							/* !_REGEX_H_ */
diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h
index 960a6d1dfce..70b03b0250a 100644
--- a/src/include/regex/regex2.h
+++ b/src/include/regex/regex2.h
@@ -78,7 +78,7 @@
  * immediately *preceding* "execution" of that operator.
  */
 typedef unsigned long sop;		/* strip operator */
-typedef long	sopno;
+typedef long sopno;
 
 #define OPRMASK 0xf8000000
 #define OPDMASK 0x07ffffff
@@ -125,12 +125,12 @@ typedef long	sopno;
  */
 typedef struct
 {
-	uch			   *ptr;		/* -> uch [csetsize] */
-	uch				mask;		/* bit within array */
-	uch				hash;		/* hash code */
-	size_t			smultis;
-	char		   *multis;		/* -> char[smulti]	ab\0cd\0ef\0\0 */
-}				cset;
+	uch		   *ptr;			/* -> uch [csetsize] */
+	uch			mask;			/* bit within array */
+	uch			hash;			/* hash code */
+	size_t		smultis;
+	char	   *multis;			/* -> char[smulti]	ab\0cd\0ef\0\0 */
+}			cset;
 
 /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
 #define CHadd(cs, c)	((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c))
@@ -149,32 +149,32 @@ typedef unsigned char cat_t;
  */
 struct re_guts
 {
-	int				magic;
+	int			magic;
 #define  MAGIC2  ((('R'^0200)<<8)|'E')
-	sop			   *strip;		/* malloced area for strip */
-	int				csetsize;	/* number of bits in a cset vector */
-	int				ncsets;		/* number of csets in use */
-	cset		   *sets;		/* -> cset [ncsets] */
-	uch			   *setbits;	/* -> uch[csetsize][ncsets/CHAR_BIT] */
-	int				cflags;		/* copy of regcomp() cflags argument */
-	sopno			nstates;	/* = number of sops */
-	sopno			firststate; /* the initial OEND (normally 0) */
-	sopno			laststate;	/* the final OEND */
-	int				iflags;		/* internal flags */
+	sop		   *strip;			/* malloced area for strip */
+	int			csetsize;		/* number of bits in a cset vector */
+	int			ncsets;			/* number of csets in use */
+	cset	   *sets;			/* -> cset [ncsets] */
+	uch		   *setbits;		/* -> uch[csetsize][ncsets/CHAR_BIT] */
+	int			cflags;			/* copy of regcomp() cflags argument */
+	sopno		nstates;		/* = number of sops */
+	sopno		firststate;		/* the initial OEND (normally 0) */
+	sopno		laststate;		/* the final OEND */
+	int			iflags;			/* internal flags */
 #define  USEBOL  01				/* used ^ */
 #define  USEEOL  02				/* used $ */
 #define  BAD	 04				/* something wrong */
-	int				nbol;		/* number of ^ used */
-	int				neol;		/* number of $ used */
-	int				ncategories;/* how many character categories */
-	cat_t		   *categories; /* ->catspace[-CHAR_MIN] */
-	char		   *must;		/* match must contain this string */
-	int				mlen;		/* length of must */
-	size_t			nsub;		/* copy of re_nsub */
-	int				backrefs;	/* does it use back references? */
-	sopno			nplus;		/* how deep does it nest +s? */
+	int			nbol;			/* number of ^ used */
+	int			neol;			/* number of $ used */
+	int			ncategories;	/* how many character categories */
+	cat_t	   *categories;		/* ->catspace[-CHAR_MIN] */
+	char	   *must;			/* match must contain this string */
+	int			mlen;			/* length of must */
+	size_t		nsub;			/* copy of re_nsub */
+	int			backrefs;		/* does it use back references? */
+	sopno		nplus;			/* how deep does it nest +s? */
 	/* catspace must be last */
-	cat_t			catspace[1];/* actually [NC] */
+	cat_t		catspace[1];	/* actually [NC] */
 };
 
 /* misc utilities */
diff --git a/src/include/regex/regexp.h b/src/include/regex/regexp.h
index cbbb26367df..d8008190708 100644
--- a/src/include/regex/regexp.h
+++ b/src/include/regex/regexp.h
@@ -49,14 +49,14 @@
 #define NSUBEXP  10
 typedef struct regexp
 {
-	char		   *startp[NSUBEXP];
-	char		   *endp[NSUBEXP];
-	char			regstart;	/* Internal use only. */
-	char			reganch;	/* Internal use only. */
-	char		   *regmust;	/* Internal use only. */
-	int				regmlen;	/* Internal use only. */
-	char			program[1]; /* Unwarranted chumminess with compiler. */
-}				regexp;
+	char	   *startp[NSUBEXP];
+	char	   *endp[NSUBEXP];
+	char		regstart;		/* Internal use only. */
+	char		reganch;		/* Internal use only. */
+	char	   *regmust;		/* Internal use only. */
+	int			regmlen;		/* Internal use only. */
+	char		program[1];		/* Unwarranted chumminess with compiler. */
+}			regexp;
 
 /* since not all systems have cdefs.h, we'll use our own here - jolly */
 
diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h
index f01f5a713b2..b1336b51c61 100644
--- a/src/include/rewrite/locks.h
+++ b/src/include/rewrite/locks.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: locks.h,v 1.4 1997/09/07 05:00:28 momjian Exp $
+ * $Id: locks.h,v 1.5 1997/09/08 02:38:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 #include "nodes/parsenodes.h"
 #include "rewrite/prs2lock.h"
 
-extern List    *
+extern List *
 matchLocks(CmdType event, RuleLock * rulelocks, int varno,
 		   Query * parsetree);
 
diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h
index 0bf8a258867..b1d2f019d0a 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prs2lock.h,v 1.5 1997/09/07 05:00:32 momjian Exp $
+ * $Id: prs2lock.h,v 1.6 1997/09/08 02:38:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,13 +22,13 @@
  */
 typedef struct RewriteRule
 {
-	Oid				ruleId;
-	CmdType			event;
-	AttrNumber		attrno;
-	Node		   *qual;
-	List		   *actions;
-	bool			isInstead;
-}				RewriteRule;
+	Oid			ruleId;
+	CmdType		event;
+	AttrNumber	attrno;
+	Node	   *qual;
+	List	   *actions;
+	bool		isInstead;
+}			RewriteRule;
 
 /*
  * RuleLock -
@@ -38,8 +38,8 @@ typedef struct RewriteRule
  */
 typedef struct RuleLock
 {
-	int				numLocks;
-	RewriteRule   **rules;
-}				RuleLock;
+	int			numLocks;
+	RewriteRule **rules;
+}			RuleLock;
 
 #endif							/* REWRITE_H */
diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h
index 214daa85f56..7dfacf39117 100644
--- a/src/include/rewrite/rewriteDefine.h
+++ b/src/include/rewrite/rewriteDefine.h
@@ -6,13 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteDefine.h,v 1.2 1997/09/07 05:00:33 momjian Exp $
+ * $Id: rewriteDefine.h,v 1.3 1997/09/08 02:38:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef REWRITEDEFINE_H
 #define REWRITEDEFINE_H
 
-extern void		DefineQueryRewrite(RuleStmt * args);
+extern void DefineQueryRewrite(RuleStmt * args);
 
 #endif							/* REWRITEDEFINE_H */
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index 3d03f29ba17..f38e7c048d8 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteHandler.h,v 1.2 1997/09/07 05:00:34 momjian Exp $
+ * $Id: rewriteHandler.h,v 1.3 1997/09/08 02:38:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,21 +16,21 @@
 
 struct _rewrite_meta_knowledge
 {
-	List		   *rt;
-	int				rt_index;
-	bool			instead_flag;
-	int				event;
-	CmdType			action;
-	int				current_varno;
-	int				new_varno;
-	Query		   *rule_action;
-	Node		   *rule_qual;
-	bool			nothing;
+	List	   *rt;
+	int			rt_index;
+	bool		instead_flag;
+	int			event;
+	CmdType		action;
+	int			current_varno;
+	int			new_varno;
+	Query	   *rule_action;
+	Node	   *rule_qual;
+	bool		nothing;
 };
 
 typedef struct _rewrite_meta_knowledge RewriteInfo;
 
 
-extern List    *QueryRewrite(Query * parsetree);
+extern List *QueryRewrite(Query * parsetree);
 
 #endif							/* REWRITEHANDLER_H */
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index 4c8b09e9889..4a2f0afb20c 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteManip.h,v 1.2 1997/09/07 05:00:35 momjian Exp $
+ * $Id: rewriteManip.h,v 1.3 1997/09/08 02:38:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,12 +14,12 @@
 #define REWRITEMANIP_H
 
 /* RewriteManip.c */
-void			OffsetVarNodes(Node * node, int offset);
-void			ChangeVarNodes(Node * node, int old_varno, int new_varno);
-void			AddQual(Query * parsetree, Node * qual);
-void			AddNotQual(Query * parsetree, Node * qual);
-void			FixResdomTypes(List * user_tlist);
-void			FixNew(RewriteInfo * info, Query * parsetree);
+void		OffsetVarNodes(Node * node, int offset);
+void		ChangeVarNodes(Node * node, int old_varno, int new_varno);
+void		AddQual(Query * parsetree, Node * qual);
+void		AddNotQual(Query * parsetree, Node * qual);
+void		FixResdomTypes(List * user_tlist);
+void		FixNew(RewriteInfo * info, Query * parsetree);
 
 void
 HandleRIRAttributeRule(Query * parsetree, List * rtable, List * targetlist,
diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h
index 947a5815eae..ad69e7af03c 100644
--- a/src/include/rewrite/rewriteRemove.h
+++ b/src/include/rewrite/rewriteRemove.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteRemove.h,v 1.2 1997/09/07 05:00:37 momjian Exp $
+ * $Id: rewriteRemove.h,v 1.3 1997/09/08 02:38:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef REWRITEREMOVE_H
 #define REWRITEREMOVE_H
 
-extern char    *RewriteGetRuleEventRel(char *rulename);
-extern void		RemoveRewriteRule(char *ruleName);
-extern void		RelationRemoveRules(Oid relid);
+extern char *RewriteGetRuleEventRel(char *rulename);
+extern void RemoveRewriteRule(char *ruleName);
+extern void RelationRemoveRules(Oid relid);
 
 #endif							/* REWRITEREMOVE_H */
diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h
index 7f517ae4ccd..99f198504ef 100644
--- a/src/include/rewrite/rewriteSupport.h
+++ b/src/include/rewrite/rewriteSupport.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteSupport.h,v 1.3 1997/09/07 05:00:38 momjian Exp $
+ * $Id: rewriteSupport.h,v 1.4 1997/09/08 02:38:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,13 +14,13 @@
 #define REWRITESUPPORT_H
 
 
-extern int		IsDefinedRewriteRule(char *ruleName);
+extern int	IsDefinedRewriteRule(char *ruleName);
 
 extern void
 prs2_addToRelation(Oid relid, Oid ruleId, CmdType event_type,
 				   AttrNumber attno, bool isInstead, Node * qual,
 				   List * actions);
-extern void		prs2_deleteFromRelation(Oid relid, Oid ruleId);
+extern void prs2_deleteFromRelation(Oid relid, Oid ruleId);
 
 
 #endif							/* REWRITESUPPORT_H */
diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h
index 5abdd770e8c..25be9a4fdcf 100644
--- a/src/include/storage/backendid.h
+++ b/src/include/storage/backendid.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: backendid.h,v 1.3 1997/09/07 05:00:40 momjian Exp $
+ * $Id: backendid.h,v 1.4 1997/09/08 02:38:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,12 +17,12 @@
  *		-cim 8/17/90
  * ----------------
  */
-typedef int16	BackendId;		/* unique currently active backend
+typedef int16 BackendId;		/* unique currently active backend
 								 * identifier */
 
 #define InvalidBackendId		(-1)
 
-typedef int32	BackendTag;		/* unique backend identifier */
+typedef int32 BackendTag;		/* unique backend identifier */
 
 #define InvalidBackendTag		(-1)
 
diff --git a/src/include/storage/block.h b/src/include/storage/block.h
index 9702b53e2eb..a057122438e 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.3 1997/09/07 05:00:42 momjian Exp $
+ * $Id: block.h,v 1.4 1997/09/08 02:38:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
  * more or less the only pieces of code that should be accessing disk
  * blocks directly.
  */
-typedef uint32	BlockNumber;
+typedef uint32 BlockNumber;
 
 #define InvalidBlockNumber		((BlockNumber) 0xFFFFFFFF)
 
@@ -49,9 +49,9 @@ typedef uint32	BlockNumber;
  */
 typedef struct BlockIdData
 {
-	uint16			bi_hi;
-	uint16			bi_lo;
-}				BlockIdData;
+	uint16		bi_hi;
+	uint16		bi_lo;
+}			BlockIdData;
 
 typedef BlockIdData *BlockId;	/* block identifier */
 
diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h
index 481033c4a73..86288cb3459 100644
--- a/src/include/storage/buf.h
+++ b/src/include/storage/buf.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buf.h,v 1.2 1997/09/07 05:00:45 momjian Exp $
+ * $Id: buf.h,v 1.3 1997/09/08 02:38:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #define InvalidBuffer	(0)
 #define UnknownBuffer	(-99999)
 
-typedef long	Buffer;
+typedef long Buffer;
 
 /*
  * BufferIsInvalid --
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index aea48e15cb1..482b15d9d10 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.15 1997/09/07 05:00:52 momjian Exp $
+ * $Id: buf_internals.h,v 1.16 1997/09/08 02:38:57 momjian Exp $
  *
  * NOTE
  *		If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -22,11 +22,11 @@
 
 /* Buf Mgr constants */
 /* in bufmgr.c */
-extern int		NBuffers;
-extern int		Data_Descriptors;
-extern int		Free_List_Descriptor;
-extern int		Lookup_List_Descriptor;
-extern int		Num_Descriptors;
+extern int	NBuffers;
+extern int	Data_Descriptors;
+extern int	Free_List_Descriptor;
+extern int	Lookup_List_Descriptor;
+extern int	Num_Descriptors;
 
 /*
  * Flags for buffer descriptors
@@ -40,19 +40,19 @@ extern int		Num_Descriptors;
 #define BM_IO_ERROR				(1 << 6)
 #define BM_JUST_DIRTIED			(1 << 7)
 
-typedef bits16	BufFlags;
+typedef bits16 BufFlags;
 
 typedef struct sbufdesc BufferDesc;
 typedef struct sbufdesc BufferHdr;
 typedef struct buftag BufferTag;
 
 /* long * so alignment will be correct */
-typedef long  **BufferBlock;
+typedef long **BufferBlock;
 
 struct buftag
 {
-	LRelId			relId;
-	BlockNumber		blockNum;	/* blknum relative to begin of reln */
+	LRelId		relId;
+	BlockNumber blockNum;		/* blknum relative to begin of reln */
 };
 
 #define CLEAR_BUFFERTAG(a)\
@@ -110,45 +110,44 @@ struct buftag
 */
 struct sbufdesc_unpadded
 {
-	Buffer			freeNext;
-	Buffer			freePrev;
-	SHMEM_OFFSET	data;
-	BufferTag		tag;
-	int				buf_id;
-	BufFlags		flags;
-	int16			bufsmgr;
-	unsigned		refcount;
+	Buffer		freeNext;
+	Buffer		freePrev;
+	SHMEM_OFFSET data;
+	BufferTag	tag;
+	int			buf_id;
+	BufFlags	flags;
+	int16		bufsmgr;
+	unsigned	refcount;
 #ifdef HAS_TEST_AND_SET
-	slock_t			io_in_progress_lock;
+	slock_t		io_in_progress_lock;
 #endif							/* HAS_TEST_AND_SET */
-	char			sb_dbname[NAMEDATALEN];
+	char		sb_dbname[NAMEDATALEN];
 
 	/* NOTE NO PADDING OF THE MEMBER HERE */
-	char			sb_relname[NAMEDATALEN];
+	char		sb_relname[NAMEDATALEN];
 };
 
 /* THE REAL STRUCTURE - the structure above must match it, minus sb_pad */
 struct sbufdesc
 {
-	Buffer			freeNext;	/* link for freelist chain */
-	Buffer			freePrev;
-	SHMEM_OFFSET	data;		/* pointer to data in buf pool */
+	Buffer		freeNext;		/* link for freelist chain */
+	Buffer		freePrev;
+	SHMEM_OFFSET data;			/* pointer to data in buf pool */
 
 	/* tag and id must be together for table lookup to work */
-	BufferTag		tag;		/* file/block identifier */
-	int				buf_id;		/* maps global desc to local desc */
+	BufferTag	tag;			/* file/block identifier */
+	int			buf_id;			/* maps global desc to local desc */
 
-	BufFlags		flags;		/* described below */
-	int16			bufsmgr;	/* storage manager id for buffer */
-	unsigned		refcount;	/* # of times buffer is pinned */
+	BufFlags	flags;			/* described below */
+	int16		bufsmgr;		/* storage manager id for buffer */
+	unsigned	refcount;		/* # of times buffer is pinned */
 
 #ifdef HAS_TEST_AND_SET
 	/* can afford a dedicated lock if test-and-set locks are available */
-	slock_t			io_in_progress_lock;
+	slock_t		io_in_progress_lock;
 #endif							/* HAS_TEST_AND_SET */
 
-	char			sb_dbname[NAMEDATALEN];		/* name of db in which buf
-												 * belongs */
+	char		sb_dbname[NAMEDATALEN]; /* name of db in which buf belongs */
 
 	/*
 	 * I padded this structure to a power of 2 (PADDED_SBUFDESC_SIZE)
@@ -167,8 +166,8 @@ struct sbufdesc
 	 * something important
 	 */
 
-	char			sb_relname[NAMEDATALEN +	/* name of reln */
-											   PADDED_SBUFDESC_SIZE - sizeof(struct sbufdesc_unpadded)];
+	char		sb_relname[NAMEDATALEN +		/* name of reln */
+				PADDED_SBUFDESC_SIZE - sizeof(struct sbufdesc_unpadded)];
 };
 
 /*
@@ -180,19 +179,19 @@ struct sbufdesc
 
 typedef struct _bmtrace
 {
-	int				bmt_pid;
-	long			bmt_buf;
-	long			bmt_dbid;
-	long			bmt_relid;
-	int				bmt_blkno;
-	int				bmt_op;
+	int			bmt_pid;
+	long		bmt_buf;
+	long		bmt_dbid;
+	long		bmt_relid;
+	int			bmt_blkno;
+	int			bmt_op;
 
 #define BMT_NOTUSED		0
 #define BMT_ALLOCFND	1
 #define BMT_ALLOCNOTFND 2
 #define BMT_DEALLOC		3
 
-}				bmtrace;
+}			bmtrace;
 
 #endif							/* BMTRACE */
 
@@ -204,39 +203,39 @@ 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);
+extern void InitFreeList(bool init);
 
 /* buf_table.c */
-extern void		InitBufTable(void);
+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;
 extern BufferBlock BufferBlocks;
-extern long    *PrivateRefCount;
-extern long    *LastRefCount;
-extern long    *CommitInfoNeedsSave;
+extern long *PrivateRefCount;
+extern long *LastRefCount;
+extern long *CommitInfoNeedsSave;
 extern SPINLOCK BufMgrLock;
 
 /* localbuf.c */
-extern long    *LocalRefCount;
+extern long *LocalRefCount;
 extern BufferDesc *LocalBufferDescriptors;
-extern int		NLocBuffer;
+extern int	NLocBuffer;
 
 extern BufferDesc *
 LocalBufferAlloc(Relation reln, BlockNumber blockNum,
 				 bool * foundPtr);
-extern int		WriteLocalBuffer(Buffer buffer, bool release);
-extern int		FlushLocalBuffer(Buffer buffer, bool release);
-extern void		InitLocalBuffer(void);
-extern void		LocalBufferSync(void);
-extern void		ResetLocalBufferPool(void);
+extern int	WriteLocalBuffer(Buffer buffer, bool release);
+extern int	FlushLocalBuffer(Buffer buffer, bool release);
+extern void InitLocalBuffer(void);
+extern void LocalBufferSync(void);
+extern void ResetLocalBufferPool(void);
 
 #endif							/* BUFMGR_INTERNALS_H */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index d432506c7cb..9f65b80f672 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.12 1997/09/07 05:01:06 momjian Exp $
+ * $Id: bufmgr.h,v 1.13 1997/09/08 02:38:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,13 +29,13 @@
  */
 #define MAXBLCKSZ		8192
 
-typedef void   *Block;
+typedef void *Block;
 
 
 /* special pageno for bget */
 #define P_NEW	InvalidBlockNumber		/* grow the file to get a new page */
 
-typedef bits16	BufferLock;
+typedef bits16 BufferLock;
 
 /**********************************************************************
 
@@ -60,7 +60,7 @@ typedef bits16	BufferLock;
 #define BufferIsPinned BufferIsValid
 
 
-extern int		ShowPinTrace;
+extern int	ShowPinTrace;
 
 /*
  * BufferWriteModes (settable via SetBufferWriteMode)
@@ -71,38 +71,38 @@ 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 ReadBuffer(Relation reln, BlockNumber blockNum);
+extern int	WriteBuffer(Buffer buffer);
+extern int	WriteNoReleaseBuffer(Buffer buffer);
+extern		Buffer
 ReleaseAndReadBuffer(Buffer buffer, Relation relation,
 					 BlockNumber blockNum);
 
-extern void		InitBufferPool(IPCKey key);
-extern void		PrintBufferUsage(FILE * statfp);
-extern void		ResetBufferUsage(void);
-extern void		ResetBufferPool(void);
-extern int		BufferPoolCheckLeak(void);
-extern void		FlushBufferPool(int StableMainMemoryFlag);
-extern bool		BufferIsValid(Buffer bufnum);
+extern void InitBufferPool(IPCKey key);
+extern void PrintBufferUsage(FILE * statfp);
+extern void ResetBufferUsage(void);
+extern void ResetBufferPool(void);
+extern int	BufferPoolCheckLeak(void);
+extern void FlushBufferPool(int StableMainMemoryFlag);
+extern bool BufferIsValid(Buffer bufnum);
 extern BlockNumber BufferGetBlockNumber(Buffer buffer);
 extern Relation BufferGetRelation(Buffer buffer);
 extern BlockNumber RelationGetNumberOfBlocks(Relation relation);
-extern Block	BufferGetBlock(Buffer buffer);
-extern void		ReleaseRelationBuffers(Relation rdesc);
-extern void		DropBuffers(Oid dbid);
-extern void		PrintBufferDescs(void);
-extern void		PrintPinnedBufs(void);
-extern int		BufferShmemSize(void);
-extern void		IncrBufferRefCount(Buffer buffer);
-extern int		ReleaseBuffer(Buffer buffer);
-
-extern void		BufferRefCountReset(int *refcountsave);
-extern void		BufferRefCountRestore(int *refcountsave);
-extern int		SetBufferWriteMode(int mode);
-extern void		SetBufferCommitInfoNeedsSave(Buffer buffer);
+extern Block BufferGetBlock(Buffer buffer);
+extern void ReleaseRelationBuffers(Relation rdesc);
+extern void DropBuffers(Oid dbid);
+extern void PrintBufferDescs(void);
+extern void PrintPinnedBufs(void);
+extern int	BufferShmemSize(void);
+extern void IncrBufferRefCount(Buffer buffer);
+extern int	ReleaseBuffer(Buffer buffer);
+
+extern void BufferRefCountReset(int *refcountsave);
+extern void BufferRefCountRestore(int *refcountsave);
+extern int	SetBufferWriteMode(int mode);
+extern void SetBufferCommitInfoNeedsSave(Buffer buffer);
 
 #endif							/* !defined(BufMgrIncluded) */
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index a252ccc3e44..4b031746f0b 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufpage.h,v 1.11 1997/09/07 05:01:10 momjian Exp $
+ * $Id: bufpage.h,v 1.12 1997/09/08 02:38:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -87,7 +87,7 @@
  * note that this is actually limited to 2^13 because we have limited
  * ItemIdData.lp_off and ItemIdData.lp_len to 13 bits (see itemid.h).
  */
-typedef uint16	LocationIndex;
+typedef uint16 LocationIndex;
 
 
 /*
@@ -101,8 +101,8 @@ typedef uint16	LocationIndex;
  */
 typedef struct OpaqueData
 {
-	uint16			od_pagesize;
-}				OpaqueData;
+	uint16		od_pagesize;
+}			OpaqueData;
 
 typedef OpaqueData *Opaque;
 
@@ -112,12 +112,12 @@ typedef OpaqueData *Opaque;
  */
 typedef struct PageHeaderData
 {
-	LocationIndex	pd_lower;	/* offset to start of free space */
-	LocationIndex	pd_upper;	/* offset to end of free space */
-	LocationIndex	pd_special; /* offset to start of special space */
-	OpaqueData		pd_opaque;	/* AM-generic information */
-	ItemIdData		pd_linp[1]; /* line pointers */
-}				PageHeaderData;
+	LocationIndex pd_lower;		/* offset to start of free space */
+	LocationIndex pd_upper;		/* offset to end of free space */
+	LocationIndex pd_special;	/* offset to start of special space */
+	OpaqueData	pd_opaque;		/* AM-generic information */
+	ItemIdData	pd_linp[1];		/* line pointers */
+}			PageHeaderData;
 
 typedef PageHeaderData *PageHeader;
 
@@ -125,7 +125,7 @@ typedef enum
 {
 	ShufflePageManagerMode,
 	OverwritePageManagerMode
-}				PageManagerMode;
+}			PageManagerMode;
 
 /* ----------------
  *		misc support macros
@@ -279,17 +279,17 @@ typedef enum
  * ----------------------------------------------------------------
  */
 
-extern void		PageInit(Page page, Size pageSize, Size specialSize);
-extern OffsetNumber
+extern void PageInit(Page page, Size pageSize, Size specialSize);
+extern		OffsetNumber
 PageAddItem(Page page, Item item, Size size,
 			OffsetNumber offsetNumber, ItemIdFlags flags);
-extern Page		PageGetTempPage(Page page, Size specialSize);
-extern void		PageRestoreTempPage(Page tempPage, Page oldPage);
+extern Page PageGetTempPage(Page page, Size specialSize);
+extern void PageRestoreTempPage(Page tempPage, Page oldPage);
 extern OffsetNumber PageGetMaxOffsetNumber(Page page);
-extern void		PageRepairFragmentation(Page page);
-extern Size		PageGetFreeSpace(Page page);
-extern void		PageManagerModeSet(PageManagerMode mode);
-extern void		PageIndexTupleDelete(Page page, OffsetNumber offset);
+extern void PageRepairFragmentation(Page page);
+extern Size PageGetFreeSpace(Page page);
+extern void PageManagerModeSet(PageManagerMode mode);
+extern void PageIndexTupleDelete(Page page, OffsetNumber offset);
 
 
 #endif							/* BUFPAGE_H */
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 9fbe004d4a3..e5404154a64 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fd.h,v 1.9 1997/09/07 05:01:12 momjian Exp $
+ * $Id: fd.h,v 1.10 1997/09/08 02:39:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,41 +40,41 @@
  * FileSeek uses the standard UNIX lseek(2) flags.
  */
 
-typedef char   *FileName;
+typedef char *FileName;
 
-typedef int		File;
+typedef int File;
 
 /* originally in libpq-fs.h */
 struct pgstat
 {								/* just the fields we need from stat
 								 * structure */
-	int				st_ino;
-	int				st_mode;
-	unsigned int	st_size;
-	unsigned int	st_sizehigh;/* high order bits */
+	int			st_ino;
+	int			st_mode;
+	unsigned int st_size;
+	unsigned int st_sizehigh;	/* high order bits */
 /* 2^64 == 1.8 x 10^20 bytes */
-	int				st_uid;
-	int				st_atime_s; /* just the seconds */
-	int				st_mtime_s; /* since SysV and the new BSD both have */
-	int				st_ctime_s; /* usec fields.. */
+	int			st_uid;
+	int			st_atime_s;		/* just the seconds */
+	int			st_mtime_s;		/* since SysV and the new BSD both have */
+	int			st_ctime_s;		/* usec fields.. */
 };
 
 /*
  * prototypes for functions in fd.c
  */
-extern File		FileNameOpenFile(FileName fileName, int fileFlags, int fileMode);
-extern File		PathNameOpenFile(FileName fileName, int fileFlags, int fileMode);
-extern void		FileClose(File file);
-extern void		FileUnlink(File file);
-extern int		FileRead(File file, char *buffer, int amount);
-extern int		FileWrite(File file, char *buffer, int amount);
-extern long		FileSeek(File file, long offset, int whence);
-extern int		FileTruncate(File file, int offset);
-extern int		FileSync(File file);
-extern int		FileNameUnlink(char *filename);
-extern FILE    *AllocateFile(char *name, char *mode);
-extern void		FreeFile(FILE *);
-extern void		closeAllVfds(void);
-extern int		pg_fsync(int fd);
+extern File FileNameOpenFile(FileName fileName, int fileFlags, int fileMode);
+extern File PathNameOpenFile(FileName fileName, int fileFlags, int fileMode);
+extern void FileClose(File file);
+extern void FileUnlink(File file);
+extern int	FileRead(File file, char *buffer, int amount);
+extern int	FileWrite(File file, char *buffer, int amount);
+extern long FileSeek(File file, long offset, int whence);
+extern int	FileTruncate(File file, int offset);
+extern int	FileSync(File file);
+extern int	FileNameUnlink(char *filename);
+extern FILE *AllocateFile(char *name, char *mode);
+extern void FreeFile(FILE *);
+extern void closeAllVfds(void);
+extern int	pg_fsync(int fd);
 
 #endif							/* FD_H */
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index 9e08d6b94ee..e75a26c0454 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.18 1997/09/07 05:01:14 momjian Exp $
+ * $Id: ipc.h,v 1.19 1997/09/08 02:39:01 momjian Exp $
  *
  * NOTES
  *	  This file is very architecture-specific.	This stuff should actually
@@ -28,15 +28,15 @@
 
 #if defined(HAS_TEST_AND_SET)
 
-extern void		S_LOCK(slock_t * lock);
-extern void		S_UNLOCK(slock_t * lock);
-extern void		S_INIT_LOCK(slock_t * lock);
+extern void S_LOCK(slock_t * lock);
+extern void S_UNLOCK(slock_t * lock);
+extern void S_INIT_LOCK(slock_t * lock);
 
 #if (defined(alpha) && !defined(linuxalpha)) || \
 	defined(hpux) || \
 	defined(irix5) || \
 	defined(nextstep)
-extern int		S_LOCK_FREE(slock_t * lock);
+extern int	S_LOCK_FREE(slock_t * lock);
 
 #else
 #define S_LOCK_FREE(lock)		((*lock) == 0)
@@ -47,14 +47,14 @@ extern int		S_LOCK_FREE(slock_t * lock);
 #ifndef HAVE_UNION_SEMUN
 union semun
 {
-	int				val;
+	int			val;
 	struct semid_ds *buf;
 	unsigned short *array;
 };
 
 #endif
 
-typedef uint16	SystemPortAddress;
+typedef uint16 SystemPortAddress;
 
 /* semaphore definitions */
 
@@ -70,8 +70,8 @@ typedef uint16	SystemPortAddress;
 #define IpcSemIdExist			(-3)
 #define IpcSemIdNotExist		(-4)
 
-typedef uint32	IpcSemaphoreKey;/* semaphore key */
-typedef int		IpcSemaphoreId;
+typedef uint32 IpcSemaphoreKey; /* semaphore key */
+typedef int IpcSemaphoreId;
 
 /* shared memory definitions */
 
@@ -79,37 +79,37 @@ typedef int		IpcSemaphoreId;
 #define IpcMemIdGetFailed		(-2)
 #define IpcMemAttachFailed		0
 
-typedef uint32	IPCKey;
+typedef uint32 IPCKey;
 
 #define PrivateIPCKey	IPC_PRIVATE
 #define DefaultIPCKey	17317
 
-typedef uint32	IpcMemoryKey;	/* shared memory key */
-typedef int		IpcMemoryId;
+typedef uint32 IpcMemoryKey;	/* shared memory key */
+typedef int IpcMemoryId;
 
 
 /* ipc.c */
-extern void		exitpg(int code);
-extern void		quasi_exitpg(void);
-extern int		on_exitpg(void (*function) (), caddr_t arg);
+extern void exitpg(int code);
+extern void quasi_exitpg(void);
+extern int	on_exitpg(void (*function) (), caddr_t arg);
 
-extern IpcSemaphoreId
+extern		IpcSemaphoreId
 IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 				   int semNum, int permission, int semStartValue,
 				   int removeOnExit, int *status);
-extern void		IpcSemaphoreKill(IpcSemaphoreKey key);
-extern void		IpcSemaphoreLock(IpcSemaphoreId semId, int sem, int lock);
-extern void		IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem, int lock);
-extern int		IpcSemaphoreGetCount(IpcSemaphoreId semId, int sem);
-extern int		IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem);
-extern IpcMemoryId
+extern void IpcSemaphoreKill(IpcSemaphoreKey key);
+extern void IpcSemaphoreLock(IpcSemaphoreId semId, int sem, int lock);
+extern void IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem, int lock);
+extern int	IpcSemaphoreGetCount(IpcSemaphoreId semId, int sem);
+extern int	IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem);
+extern		IpcMemoryId
 IpcMemoryCreate(IpcMemoryKey memKey, uint32 size,
 				int permission);
 extern IpcMemoryId IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size);
-extern char    *IpcMemoryAttach(IpcMemoryId memId);
-extern void		IpcMemoryKill(IpcMemoryKey memKey);
-extern void		CreateAndInitSLockMemory(IPCKey key);
-extern void		AttachSLockMemory(IPCKey key);
+extern char *IpcMemoryAttach(IpcMemoryId memId);
+extern void IpcMemoryKill(IpcMemoryKey memKey);
+extern void CreateAndInitSLockMemory(IPCKey key);
+extern void AttachSLockMemory(IPCKey key);
 
 
 #ifdef HAS_TEST_AND_SET
@@ -135,24 +135,24 @@ typedef enum _LockId_
 
 	PROCSTRUCTLOCKID,
 	FIRSTFREELOCKID
-}				_LockId_;
+}			_LockId_;
 
 #define MAX_SPINS		FIRSTFREELOCKID
 
 typedef struct slock
 {
-	slock_t			locklock;
-	unsigned char	flag;
-	short			nshlocks;
-	slock_t			shlock;
-	slock_t			exlock;
-	slock_t			comlock;
-	struct slock   *next;
-}				SLock;
-
-extern void		ExclusiveLock(int lockid);
-extern void		ExclusiveUnlock(int lockid);
-extern bool		LockIsFree(int lockid);
+	slock_t		locklock;
+	unsigned char flag;
+	short		nshlocks;
+	slock_t		shlock;
+	slock_t		exlock;
+	slock_t		comlock;
+	struct slock *next;
+}			SLock;
+
+extern void ExclusiveLock(int lockid);
+extern void ExclusiveUnlock(int lockid);
+extern bool LockIsFree(int lockid);
 
 #else							/* HAS_TEST_AND_SET */
 
@@ -171,7 +171,7 @@ typedef enum _LockId_
 	PROCSTRUCTLOCKID,
 	OIDGENLOCKID,
 	FIRSTFREELOCKID
-}				_LockId_;
+}			_LockId_;
 
 #define MAX_SPINS		FIRSTFREELOCKID
 
@@ -220,8 +220,8 @@ typedef enum _LockId_
 		((key == PrivateIPCKey) ? key : 14 + (key))
 
 /* ipci.c */
-extern IPCKey	SystemPortAddressCreateIPCKey(SystemPortAddress address);
-extern void		CreateSharedMemoryAndSemaphores(IPCKey key);
-extern void		AttachSharedMemoryAndSemaphores(IPCKey key);
+extern IPCKey SystemPortAddressCreateIPCKey(SystemPortAddress address);
+extern void CreateSharedMemoryAndSemaphores(IPCKey key);
+extern void AttachSharedMemoryAndSemaphores(IPCKey key);
 
 #endif							/* IPC_H */
diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h
index 9e5e6f94d4a..1c382fb1b9e 100644
--- a/src/include/storage/itemid.h
+++ b/src/include/storage/itemid.h
@@ -6,27 +6,27 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itemid.h,v 1.2 1997/09/07 05:01:17 momjian Exp $
+ * $Id: itemid.h,v 1.3 1997/09/08 02:39:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ITEMID_H
 #define ITEMID_H
 
-typedef uint16	ItemOffset;
-typedef uint16	ItemLength;
+typedef uint16 ItemOffset;
+typedef uint16 ItemLength;
 
-typedef bits16	ItemIdFlags;
+typedef bits16 ItemIdFlags;
 
 
 
 typedef struct ItemIdData
 {								/* line pointers */
-	unsigned		lp_off:13,	/* offset to find tup */
+	unsigned	lp_off:13,		/* offset to find tup */
 	/* can be reduced by 2 if necc. */
-					lp_flags:6, /* flags on tuple */
-					lp_len:13;	/* length of tuple */
-}				ItemIdData;
+				lp_flags:6,		/* flags on tuple */
+				lp_len:13;		/* length of tuple */
+}			ItemIdData;
 
 typedef struct ItemIdData *ItemId;
 
diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h
index bea9cd64746..332636ce95f 100644
--- a/src/include/storage/itempos.h
+++ b/src/include/storage/itempos.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itempos.h,v 1.4 1997/09/07 05:01:20 momjian Exp $
+ * $Id: itempos.h,v 1.5 1997/09/08 02:39:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,11 +18,11 @@
 
 typedef struct ItemSubpositionData
 {
-	Buffer			op_db;
-	ItemId			op_lpp;
-	char		   *op_cp;		/* XXX */
-	uint32			op_len;
-}				ItemSubpositionData;
+	Buffer		op_db;
+	ItemId		op_lpp;
+	char	   *op_cp;			/* XXX */
+	uint32		op_len;
+}			ItemSubpositionData;
 
 typedef ItemSubpositionData *ItemSubposition;
 
diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h
index 3460cd19f9e..b6156ca229c 100644
--- a/src/include/storage/itemptr.h
+++ b/src/include/storage/itemptr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itemptr.h,v 1.5 1997/09/07 05:01:22 momjian Exp $
+ * $Id: itemptr.h,v 1.6 1997/09/08 02:39:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,9 +25,9 @@
  */
 typedef struct ItemPointerData
 {
-	BlockIdData		ip_blkid;
-	OffsetNumber	ip_posid;
-}				ItemPointerData;
+	BlockIdData ip_blkid;
+	OffsetNumber ip_posid;
+}			ItemPointerData;
 
 typedef ItemPointerData *ItemPointer;
 
@@ -108,6 +108,6 @@ typedef ItemPointerData *ItemPointer;
  * ----------------
  */
 
-extern bool		ItemPointerEquals(ItemPointer pointer1, ItemPointer pointer2);
+extern bool ItemPointerEquals(ItemPointer pointer1, ItemPointer pointer2);
 
 #endif							/* ITEMPTR_H */
diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index 1144d1ca02d..710b1bac5c2 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: large_object.h,v 1.5 1997/09/07 05:01:24 momjian Exp $
+ * $Id: large_object.h,v 1.6 1997/09/08 02:39:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,22 +23,22 @@
  */
 typedef struct LargeObjectDesc
 {
-	Relation		heap_r;		/* heap relation */
-	Relation		index_r;	/* index relation on seqno attribute */
-	IndexScanDesc	iscan;		/* index scan we're using */
-	TupleDesc		hdesc;		/* heap relation tuple desc */
-	TupleDesc		idesc;		/* index relation tuple desc */
-	uint32			lowbyte;	/* low byte on the current page */
-	uint32			highbyte;	/* high byte on the current page */
-	uint32			offset;		/* current seek pointer */
+	Relation	heap_r;			/* heap relation */
+	Relation	index_r;		/* index relation on seqno attribute */
+	IndexScanDesc iscan;		/* index scan we're using */
+	TupleDesc	hdesc;			/* heap relation tuple desc */
+	TupleDesc	idesc;			/* index relation tuple desc */
+	uint32		lowbyte;		/* low byte on the current page */
+	uint32		highbyte;		/* high byte on the current page */
+	uint32		offset;			/* current seek pointer */
 	ItemPointerData htid;		/* tid of current heap tuple */
 
 #define IFS_RDLOCK		(1 << 0)
 #define IFS_WRLOCK		(1 << 1)
 #define IFS_ATEOF		(1 << 2)
 
-	u_long			flags;		/* locking info, etc */
-}				LargeObjectDesc;
+	u_long		flags;			/* locking info, etc */
+}			LargeObjectDesc;
 
 /*
  * Function definitions...
@@ -47,11 +47,11 @@ typedef struct LargeObjectDesc
 /* inversion stuff in inv_api.c */
 extern LargeObjectDesc *inv_create(int flags);
 extern LargeObjectDesc *inv_open(Oid lobjId, int flags);
-extern void		inv_close(LargeObjectDesc * obj_desc);
-extern int		inv_destroy(Oid lobjId);
-extern int		inv_seek(LargeObjectDesc * obj_desc, int offset, int whence);
-extern int		inv_tell(LargeObjectDesc * obj_desc);
-extern int		inv_read(LargeObjectDesc * obj_desc, char *buf, int nbytes);
-extern int		inv_write(LargeObjectDesc * obj_desc, char *buf, int nbytes);
+extern void inv_close(LargeObjectDesc * obj_desc);
+extern int	inv_destroy(Oid lobjId);
+extern int	inv_seek(LargeObjectDesc * obj_desc, int offset, int whence);
+extern int	inv_tell(LargeObjectDesc * obj_desc);
+extern int	inv_read(LargeObjectDesc * obj_desc, char *buf, int nbytes);
+extern int	inv_write(LargeObjectDesc * obj_desc, char *buf, int nbytes);
 
 #endif							/* LARGE_OBJECT_H */
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index debe950c7c5..bd8d50f709f 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.6 1997/09/07 05:01:25 momjian Exp $
+ * $Id: lmgr.h,v 1.7 1997/09/08 02:39:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,31 +22,31 @@
  */
 typedef struct LRelId
 {
-	Oid				relId;		/* a relation identifier */
-	Oid				dbId;		/* a database identifier */
-}				LRelId;
+	Oid			relId;			/* a relation identifier */
+	Oid			dbId;			/* a database identifier */
+}			LRelId;
 
 typedef struct LockInfoData
 {
-	bool			initialized;
-	LRelId			lRelId;
-	TransactionId	transactionIdData;
-	uint16			flags;
-}				LockInfoData;
+	bool		initialized;
+	LRelId		lRelId;
+	TransactionId transactionIdData;
+	uint16		flags;
+}			LockInfoData;
 typedef LockInfoData *LockInfo;
 
 #define LockInfoIsValid(linfo) \
 		((PointerIsValid(linfo)) &&  ((LockInfo) linfo)->initialized)
 
 
-extern LRelId	RelationGetLRelId(Relation relation);
-extern Oid		LRelIdGetRelationId(LRelId lRelId);
-extern void		RelationInitLockInfo(Relation relation);
-extern void		RelationSetLockForDescriptorOpen(Relation relation);
-extern void		RelationSetLockForRead(Relation relation);
-extern void		RelationUnsetLockForRead(Relation relation);
-extern void		RelationSetLockForWrite(Relation relation);
-extern void		RelationUnsetLockForWrite(Relation relation);
+extern LRelId RelationGetLRelId(Relation relation);
+extern Oid	LRelIdGetRelationId(LRelId lRelId);
+extern void RelationInitLockInfo(Relation relation);
+extern void RelationSetLockForDescriptorOpen(Relation relation);
+extern void RelationSetLockForRead(Relation relation);
+extern void RelationUnsetLockForRead(Relation relation);
+extern void RelationSetLockForWrite(Relation relation);
+extern void RelationUnsetLockForWrite(Relation relation);
 
 /* used in vaccum.c */
 extern void
@@ -66,18 +66,18 @@ RelationSetSingleRLockPage(Relation relation,
 extern void
 RelationUnsetSingleRLockPage(Relation relation,
 							 ItemPointer itemPointer);
-extern void		RelationSetRIntentLock(Relation relation);
-extern void		RelationUnsetRIntentLock(Relation relation);
-extern void		RelationSetWIntentLock(Relation relation);
-extern void		RelationUnsetWIntentLock(Relation relation);
+extern void RelationSetRIntentLock(Relation relation);
+extern void RelationUnsetRIntentLock(Relation relation);
+extern void RelationSetWIntentLock(Relation relation);
+extern void RelationUnsetWIntentLock(Relation relation);
 
 /* single.c */
-extern bool		SingleLockReln(LockInfo linfo, LOCKT lockt, int action);
-extern bool
+extern bool SingleLockReln(LockInfo linfo, LOCKT lockt, int action);
+extern		bool
 SingleLockPage(LockInfo linfo, ItemPointer tidPtr,
 			   LOCKT lockt, int action);
 
 /* proc.c */
-extern void		InitProcGlobal(IPCKey key);
+extern void InitProcGlobal(IPCKey key);
 
 #endif							/* LMGR_H */
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 2b0f76649b4..89879575342 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lock.h,v 1.6 1997/09/07 05:01:26 momjian Exp $
+ * $Id: lock.h,v 1.7 1997/09/08 02:39:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 #include <storage/itemptr.h>
 
 extern SPINLOCK LockMgrLock;
-typedef int		MASK;
+typedef int MASK;
 
 #define INIT_TABLE_SIZE			100
 #define MAX_TABLE_SIZE			1000
@@ -36,9 +36,9 @@ typedef int		MASK;
 #define NLOCKS_PER_XACT 40
 #define NLOCKENTS NLOCKS_PER_XACT*NBACKENDS
 
-typedef int		LOCK_TYPE;
-typedef int		LOCKT;
-typedef int		LockTableId;
+typedef int LOCK_TYPE;
+typedef int LOCKT;
+typedef int LockTableId;
 
 /* MAX_LOCKTYPES cannot be larger than the bits in MASK */
 #define MAX_LOCKTYPES 6
@@ -57,10 +57,10 @@ typedef int		LockTableId;
 
 typedef struct ltag
 {
-	Oid				relId;
-	Oid				dbId;
+	Oid			relId;
+	Oid			dbId;
 	ItemPointerData tupleId;
-}				LOCKTAG;
+}			LOCKTAG;
 
 #define TAGSIZE (sizeof(LOCKTAG))
 
@@ -86,12 +86,12 @@ typedef struct ltag
  */
 typedef struct lockctl
 {
-	LockTableId		tableId;
-	int				nLockTypes;
-	int				conflictTab[MAX_LOCKTYPES];
-	int				prio[MAX_LOCKTYPES];
-	SPINLOCK		masterLock;
-}				LOCKCTL;
+	LockTableId tableId;
+	int			nLockTypes;
+	int			conflictTab[MAX_LOCKTYPES];
+	int			prio[MAX_LOCKTYPES];
+	SPINLOCK	masterLock;
+}			LOCKCTL;
 
 /*
  * lockHash -- hash table on lock Ids,
@@ -101,10 +101,10 @@ typedef struct lockctl
  */
 typedef struct ltable
 {
-	HTAB		   *lockHash;
-	HTAB		   *xidHash;
-	LOCKCTL		   *ctl;
-}				LOCKTAB;
+	HTAB	   *lockHash;
+	HTAB	   *xidHash;
+	LOCKCTL    *ctl;
+}			LOCKTAB;
 
 /* -----------------------
  * A transaction never conflicts with its own locks.  Hence, if
@@ -137,30 +137,30 @@ typedef struct ltable
 
 typedef struct XIDTAG
 {
-	SHMEM_OFFSET	lock;
-	int				pid;
-	TransactionId	xid;
-}				XIDTAG;
+	SHMEM_OFFSET lock;
+	int			pid;
+	TransactionId xid;
+}			XIDTAG;
 
 typedef struct XIDLookupEnt
 {
 	/* tag */
-	XIDTAG			tag;
+	XIDTAG		tag;
 
 	/* data */
-	int				holders[MAX_LOCKTYPES];
-	int				nHolding;
-	SHM_QUEUE		queue;
-}				XIDLookupEnt;
+	int			holders[MAX_LOCKTYPES];
+	int			nHolding;
+	SHM_QUEUE	queue;
+}			XIDLookupEnt;
 
 #define XID_TAGSIZE (sizeof(XIDTAG))
 
 /* originally in procq.h */
 typedef struct procQueue
 {
-	SHM_QUEUE		links;
-	int				size;
-}				PROC_QUEUE;
+	SHM_QUEUE	links;
+	int			size;
+}			PROC_QUEUE;
 
 
 /*
@@ -177,16 +177,16 @@ typedef struct procQueue
 typedef struct Lock
 {
 	/* hash key */
-	LOCKTAG			tag;
+	LOCKTAG		tag;
 
 	/* data */
-	int				mask;
-	PROC_QUEUE		waitProcs;
-	int				holders[MAX_LOCKTYPES];
-	int				nHolding;
-	int				activeHolders[MAX_LOCKTYPES];
-	int				nActive;
-}				LOCK;
+	int			mask;
+	PROC_QUEUE	waitProcs;
+	int			holders[MAX_LOCKTYPES];
+	int			nHolding;
+	int			activeHolders[MAX_LOCKTYPES];
+	int			nActive;
+}			LOCK;
 
 #define LockGetLock_nHolders(l) l->nHolders
 
@@ -202,23 +202,23 @@ extern SPINLOCK LockMgrLock;
 /*
  * function prototypes
  */
-extern void		InitLocks(void);
-extern void		LockDisable(int status);
-extern LockTableId
+extern void InitLocks(void);
+extern void LockDisable(int status);
+extern		LockTableId
 LockTabInit(char *tabName, MASK * conflictsP, int *prioP,
 			int ntypes);
-extern bool		LockAcquire(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt);
+extern bool LockAcquire(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt);
 extern int
 LockResolveConflicts(LOCKTAB * ltable, LOCK * lock, LOCKT lockt,
 					 TransactionId xid);
-extern bool		LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt);
-extern void		GrantLock(LOCK * lock, LOCKT lockt);
-extern bool		LockReleaseAll(LockTableId tableId, SHM_QUEUE * lockQueue);
-extern int		LockShmemSize(void);
-extern bool		LockingDisabled(void);
+extern bool LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt);
+extern void GrantLock(LOCK * lock, LOCKT lockt);
+extern bool LockReleaseAll(LockTableId tableId, SHM_QUEUE * lockQueue);
+extern int	LockShmemSize(void);
+extern bool LockingDisabled(void);
 
 #ifdef DEADLOCK_DEBUG
-extern void		DumpLocks(void);
+extern void DumpLocks(void);
 
 #endif
 
diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h
index befc6227ae9..3d4aa1edbb9 100644
--- a/src/include/storage/multilev.h
+++ b/src/include/storage/multilev.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: multilev.h,v 1.4 1997/09/07 05:01:28 momjian Exp $
+ * $Id: multilev.h,v 1.5 1997/09/08 02:39:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,7 +39,7 @@
 #define RELN_LEVEL 0
 #define PAGE_LEVEL 1
 #define TUPLE_LEVEL 2
-typedef int		LOCK_LEVEL;
+typedef int LOCK_LEVEL;
 
 /* multi.c */
 
@@ -50,9 +50,9 @@ extern LockTableId ShortTermTableId;
  * function prototypes
  */
 extern LockTableId InitMultiLevelLockm(void);
-extern bool		MultiLockReln(LockInfo linfo, LOCKT lockt);
-extern bool		MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);
-extern bool		MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);
-extern bool		MultiReleaseReln(LockInfo linfo, LOCKT lockt);
+extern bool MultiLockReln(LockInfo linfo, LOCKT lockt);
+extern bool MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);
+extern bool MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);
+extern bool MultiReleaseReln(LockInfo linfo, LOCKT lockt);
 
 #endif							/* MULTILEV_H */
diff --git a/src/include/storage/off.h b/src/include/storage/off.h
index 3eadb842a78..3dc72d6701a 100644
--- a/src/include/storage/off.h
+++ b/src/include/storage/off.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: off.h,v 1.3 1997/09/07 05:01:29 momjian Exp $
+ * $Id: off.h,v 1.4 1997/09/08 02:39:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
  * this is a 1-based index into the linp (ItemIdData) array in the
  * header of each disk page.
  */
-typedef uint16	OffsetNumber;
+typedef uint16 OffsetNumber;
 
 #define InvalidOffsetNumber		((OffsetNumber) 0)
 #define FirstOffsetNumber		((OffsetNumber) 1)
diff --git a/src/include/storage/pagenum.h b/src/include/storage/pagenum.h
index edd0dc116be..95e2b4beb4d 100644
--- a/src/include/storage/pagenum.h
+++ b/src/include/storage/pagenum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pagenum.h,v 1.4 1997/09/07 05:01:32 momjian Exp $
+ * $Id: pagenum.h,v 1.5 1997/09/08 02:39:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,9 +14,9 @@
 #define PAGENUM_H
 
 
-typedef uint16	PageNumber;
+typedef uint16 PageNumber;
 
-typedef uint32	LogicalPageNumber;
+typedef uint32 LogicalPageNumber;
 
 #define InvalidLogicalPageNumber		0
 
diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h
index c5611ba0c12..46965b9fbdc 100644
--- a/src/include/storage/pos.h
+++ b/src/include/storage/pos.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pos.h,v 1.3 1997/09/07 05:01:33 momjian Exp $
+ * $Id: pos.h,v 1.4 1997/09/08 02:39:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,7 @@
  * pointer array contained on every page that store (heap or index)
  * tuples.
  */
-typedef bits16	PositionIdData;
+typedef bits16 PositionIdData;
 typedef PositionIdData *PositionId;
 
 /* ----------------
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 92829732714..d8ea70918a7 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: proc.h,v 1.6 1997/09/07 05:01:34 momjian Exp $
+ * $Id: proc.h,v 1.7 1997/09/08 02:39:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,11 +17,11 @@
 
 typedef struct
 {
-	int				sleeplock;
-	int				semNum;
-	IpcSemaphoreId	semId;
+	int			sleeplock;
+	int			semNum;
+	IpcSemaphoreId semId;
 	IpcSemaphoreKey semKey;
-}				SEMA;
+}			SEMA;
 
 /*
  * Each backend has:
@@ -31,30 +31,30 @@ typedef struct proc
 
 	/* proc->links MUST BE THE FIRST ELEMENT OF STRUCT (see ProcWakeup()) */
 
-	SHM_QUEUE		links;		/* proc can be waiting for one event(lock) */
-	SEMA			sem;		/* ONE semaphore to sleep on */
-	int				errType;	/* error code tells why we woke up */
+	SHM_QUEUE	links;			/* proc can be waiting for one event(lock) */
+	SEMA		sem;			/* ONE semaphore to sleep on */
+	int			errType;		/* error code tells why we woke up */
 
-	int				procId;		/* unique number for this structure NOT
+	int			procId;			/* unique number for this structure NOT
 								 * unique per backend, these things are
 								 * reused after the backend dies. */
 
-	int				critSects;	/* If critSects > 0, we are in sensitive
+	int			critSects;		/* If critSects > 0, we are in sensitive
 								 * routines that cannot be recovered when
 								 * the process fails. */
 
-	int				prio;		/* priority for sleep queue */
+	int			prio;			/* priority for sleep queue */
 
-	TransactionId	xid;		/* transaction currently being executed by
+	TransactionId xid;			/* transaction currently being executed by
 								 * this proc */
 
-	LOCK		   *waitLock;	/* Lock we're sleeping on */
-	int				token;		/* info for proc wakeup routines */
-	int				pid;		/* This procs process id */
-	short			sLocks[MAX_SPINS];	/* Spin lock stats */
-	SHM_QUEUE		lockQueue;	/* locks associated with current
+	LOCK	   *waitLock;		/* Lock we're sleeping on */
+	int			token;			/* info for proc wakeup routines */
+	int			pid;			/* This procs process id */
+	short		sLocks[MAX_SPINS];		/* Spin lock stats */
+	SHM_QUEUE	lockQueue;		/* locks associated with current
 								 * transaction */
-}				PROC;
+}			PROC;
 
 
 /*
@@ -68,13 +68,13 @@ typedef struct proc
 
 typedef struct procglobal
 {
-	SHMEM_OFFSET	freeProcs;
-	int				numProcs;
-	IPCKey			currKey;
-	int32			freeSemMap[MAX_PROC_SEMS / PROC_NSEMS_PER_SET];
-}				PROC_HDR;
+	SHMEM_OFFSET freeProcs;
+	int			numProcs;
+	IPCKey		currKey;
+	int32		freeSemMap[MAX_PROC_SEMS / PROC_NSEMS_PER_SET];
+}			PROC_HDR;
 
-extern PROC    *MyProc;
+extern PROC *MyProc;
 
 #define PROC_INCR_SLOCK(lock) if (MyProc) (MyProc->sLocks[(lock)])++
 #define PROC_DECR_SLOCK(lock) if (MyProc) (MyProc->sLocks[(lock)])--
@@ -94,20 +94,20 @@ extern SPINLOCK ProcStructLock;
 /*
  * Function Prototypes
  */
-extern void		InitProcess(IPCKey key);
-extern void		ProcReleaseLocks(void);
-extern bool		ProcRemove(int pid);
+extern void InitProcess(IPCKey key);
+extern void ProcReleaseLocks(void);
+extern bool ProcRemove(int pid);
 
 /* extern bool ProcKill(int exitStatus, int pid); */
 /* make static in storage/lmgr/proc.c -- jolly */
 
-extern void		ProcQueueInit(PROC_QUEUE * queue);
+extern void ProcQueueInit(PROC_QUEUE * queue);
 extern int
 ProcSleep(PROC_QUEUE * queue, SPINLOCK spinlock, int token,
 		  int prio, LOCK * lock);
-extern int		ProcLockWakeup(PROC_QUEUE * queue, char *ltable, char *lock);
-extern void		ProcAddLock(SHM_QUEUE * elem);
-extern void		ProcReleaseSpins(PROC * proc);
-extern void		ProcFreeAllSemaphores(void);
+extern int	ProcLockWakeup(PROC_QUEUE * queue, char *ltable, char *lock);
+extern void ProcAddLock(SHM_QUEUE * elem);
+extern void ProcReleaseSpins(PROC * proc);
+extern void ProcFreeAllSemaphores(void);
 
 #endif							/* PROC_H */
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 5812a718717..997c8c1c5e5 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.6 1997/09/07 05:01:35 momjian Exp $
+ * $Id: shmem.h,v 1.7 1997/09/08 02:39:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,28 +54,28 @@ extern SPINLOCK BindingLock;
 /* shmemqueue.c */
 typedef struct SHM_QUEUE
 {
-	SHMEM_OFFSET	prev;
-	SHMEM_OFFSET	next;
-}				SHM_QUEUE;
+	SHMEM_OFFSET prev;
+	SHMEM_OFFSET next;
+}			SHM_QUEUE;
 
 /* shmem.c */
-extern void		ShmemBindingTabReset(void);
-extern void		ShmemCreate(unsigned int key, unsigned int size);
-extern int		InitShmem(unsigned int key, unsigned int size);
-extern long    *ShmemAlloc(unsigned long size);
-extern int		ShmemIsValid(unsigned long addr);
-extern HTAB    *
+extern void ShmemBindingTabReset(void);
+extern void ShmemCreate(unsigned int key, unsigned int size);
+extern int	InitShmem(unsigned int key, unsigned int size);
+extern long *ShmemAlloc(unsigned long size);
+extern int	ShmemIsValid(unsigned long addr);
+extern HTAB *
 ShmemInitHash(char *name, long init_size, long max_size,
 			  HASHCTL * infoP, int hash_flags);
-extern bool		ShmemPIDLookup(int pid, SHMEM_OFFSET * locationPtr);
+extern bool ShmemPIDLookup(int pid, SHMEM_OFFSET * locationPtr);
 extern SHMEM_OFFSET ShmemPIDDestroy(int pid);
-extern long    *
+extern long *
 ShmemInitStruct(char *name, unsigned long size,
 				bool * foundPtr);
-extern bool		TransactionIdIsInProgress(TransactionId xid);
+extern bool TransactionIdIsInProgress(TransactionId xid);
 
 
-typedef int		TableID;
+typedef int TableID;
 
 /* size constants for the binding table */
  /* max size of data structure string name */
@@ -88,21 +88,21 @@ typedef int		TableID;
 /* this is a hash bucket in the binding table */
 typedef struct
 {
-	char			key[BTABLE_KEYSIZE];		/* string name */
-	unsigned long	location;	/* location in shared mem */
-	unsigned long	size;		/* numbytes allocated for the structure */
-}				BindingEnt;
+	char		key[BTABLE_KEYSIZE];	/* string name */
+	unsigned long location;		/* location in shared mem */
+	unsigned long size;			/* numbytes allocated for the structure */
+}			BindingEnt;
 
 /*
  * prototypes for functions in shmqueue.c
  */
-extern void		SHMQueueInit(SHM_QUEUE * queue);
-extern void		SHMQueueElemInit(SHM_QUEUE * queue);
-extern void		SHMQueueDelete(SHM_QUEUE * queue);
-extern void		SHMQueueInsertTL(SHM_QUEUE * queue, SHM_QUEUE * elem);
+extern void SHMQueueInit(SHM_QUEUE * queue);
+extern void SHMQueueElemInit(SHM_QUEUE * queue);
+extern void SHMQueueDelete(SHM_QUEUE * queue);
+extern void SHMQueueInsertTL(SHM_QUEUE * queue, SHM_QUEUE * elem);
 extern void
 SHMQueueFirst(SHM_QUEUE * queue, Pointer * nextPtrPtr,
 			  SHM_QUEUE * nextQueue);
-extern bool		SHMQueueEmpty(SHM_QUEUE * queue);
+extern bool SHMQueueEmpty(SHM_QUEUE * queue);
 
 #endif							/* SHMEM_H */
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index fd9025e875f..55f6b6bd60d 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinval.h,v 1.5 1997/09/07 05:01:36 momjian Exp $
+ * $Id: sinval.h,v 1.6 1997/09/08 02:39:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,14 +18,14 @@
 
 extern SPINLOCK SInvalLock;
 
-extern void		CreateSharedInvalidationState(IPCKey key);
-extern void		AttachSharedInvalidationState(IPCKey key);
-extern void		InitSharedInvalidationState(void);
+extern void CreateSharedInvalidationState(IPCKey key);
+extern void AttachSharedInvalidationState(IPCKey key);
+extern void InitSharedInvalidationState(void);
 extern void
 RegisterSharedInvalid(int cacheId, Index hashIndex,
 					  ItemPointer pointer);
-extern void		InvalidateSharedInvalid(void (*invalFunction) (),
-											   void (*resetFunction) ());
+extern void InvalidateSharedInvalid(void (*invalFunction) (),
+												void (*resetFunction) ());
 
 
 #endif							/* SINVAL_H */
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index 12efeb2c8b8..1862cda616e 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinvaladt.h,v 1.4 1997/09/07 05:01:37 momjian Exp $
+ * $Id: sinvaladt.h,v 1.5 1997/09/08 02:39:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,37 +53,37 @@ C----------------End shared segment -------
 
 typedef struct ProcState
 {
-	int				limit;		/* the number of read messages			*/
-	bool			resetState; /* true, if backend has to reset its state */
-	int				tag;		/* special tag, recieved from the
+	int			limit;			/* the number of read messages			*/
+	bool		resetState;		/* true, if backend has to reset its state */
+	int			tag;			/* special tag, recieved from the
 								 * postmaster */
-}				ProcState;
+}			ProcState;
 
 
 typedef struct SISeg
 {
-	IpcSemaphoreId	criticalSectionSemaphoreId; /* semaphore id		*/
-	IpcSemaphoreId	generalSemaphoreId; /* semaphore id		*/
-	Offset			startEntrySection;	/* (offset a)					*/
-	Offset			endEntrySection;	/* (offset a + b)				*/
-	Offset			startFreeSpace;		/* (offset relative to B)		*/
-	Offset			startEntryChain;	/* (offset relative to B)		*/
-	Offset			endEntryChain;		/* (offset relative to B)		*/
-	int				numEntries;
-	int				maxNumEntries;
-	ProcState		procState[MaxBackendId];	/* reflects the
+	IpcSemaphoreId criticalSectionSemaphoreId;	/* semaphore id		*/
+	IpcSemaphoreId generalSemaphoreId;	/* semaphore id		*/
+	Offset		startEntrySection;		/* (offset a)					*/
+	Offset		endEntrySection;/* (offset a + b)				*/
+	Offset		startFreeSpace; /* (offset relative to B)		*/
+	Offset		startEntryChain;/* (offset relative to B)		*/
+	Offset		endEntryChain;	/* (offset relative to B)		*/
+	int			numEntries;
+	int			maxNumEntries;
+	ProcState	procState[MaxBackendId];		/* reflects the
 												 * invalidation state */
 	/* here starts the entry section, controlled by offsets */
-}				SISeg;
+}			SISeg;
 
 #define SizeSISeg	  sizeof(SISeg)
 
 typedef struct SharedInvalidData
 {
-	int				cacheId;	/* XXX */
-	Index			hashIndex;
+	int			cacheId;		/* XXX */
+	Index		hashIndex;
 	ItemPointerData pointerData;
-}				SharedInvalidData;
+}			SharedInvalidData;
 
 typedef SharedInvalidData *SharedInvalid;
 
@@ -91,18 +91,18 @@ typedef SharedInvalidData *SharedInvalid;
 typedef struct SISegEntry
 {
 	SharedInvalidData entryData;/* the message data */
-	bool			isfree;		/* entry free? */
-	Offset			next;		/* offset to next entry */
-}				SISegEntry;
+	bool		isfree;			/* entry free? */
+	Offset		next;			/* offset to next entry */
+}			SISegEntry;
 
 #define SizeOfOneSISegEntry   sizeof(SISegEntry)
 
 typedef struct SISegOffsets
 {
-	Offset			startSegment;		/* always 0 (for now) */
-	Offset			offsetToFirstEntry; /* A + a = B */
-	Offset			offsetToEndOfSegemnt;		/* A + a + b */
-}				SISegOffsets;
+	Offset		startSegment;	/* always 0 (for now) */
+	Offset		offsetToFirstEntry;		/* A + a = B */
+	Offset		offsetToEndOfSegemnt;	/* A + a + b */
+}			SISegOffsets;
 
 
 /****************************************************************************/
@@ -114,20 +114,20 @@ typedef struct SISegOffsets
 #define SI_SharedLock	  (-1)
 #define SI_ExclusiveLock  (-255)
 
-extern SISeg   *shmInvalBuffer;
+extern SISeg *shmInvalBuffer;
 
 /*
  * prototypes for functions in sinvaladt.c
  */
-extern int		SIBackendInit(SISeg * segInOutP);
-extern int		SISegmentInit(bool killExistingSegment, IPCKey key);
+extern int	SIBackendInit(SISeg * segInOutP);
+extern int	SISegmentInit(bool killExistingSegment, IPCKey key);
 
-extern bool		SISetDataEntry(SISeg * segP, SharedInvalidData * data);
-extern void		SISetProcStateInvalid(SISeg * segP);
-extern bool		SIDelDataEntry(SISeg * segP);
+extern bool SISetDataEntry(SISeg * segP, SharedInvalidData * data);
+extern void SISetProcStateInvalid(SISeg * segP);
+extern bool SIDelDataEntry(SISeg * segP);
 extern void
 SIReadEntryData(SISeg * segP, int backendId,
 				void (*invalFunction) (), void (*resetFunction) ());
-extern void		SIDelExpiredDataEntries(SISeg * segP);
+extern void SIDelExpiredDataEntries(SISeg * segP);
 
 #endif							/* SINVALADT_H */
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index 38c2164f891..08ada1ae30c 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: smgr.h,v 1.8 1997/09/07 05:01:38 momjian Exp $
+ * $Id: smgr.h,v 1.9 1997/09/08 02:39:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,12 +22,12 @@
 
 #define DEFAULT_SMGR	0
 
-extern int		smgrinit(void);
-extern int		smgrcreate(int16 which, Relation reln);
-extern int		smgrunlink(int16 which, Relation reln);
-extern int		smgrextend(int16 which, Relation reln, char *buffer);
-extern int		smgropen(int16 which, Relation reln);
-extern int		smgrclose(int16 which, Relation reln);
+extern int	smgrinit(void);
+extern int	smgrcreate(int16 which, Relation reln);
+extern int	smgrunlink(int16 which, Relation reln);
+extern int	smgrextend(int16 which, Relation reln, char *buffer);
+extern int	smgropen(int16 which, Relation reln);
+extern int	smgrclose(int16 which, Relation reln);
 extern int
 smgrread(int16 which, Relation reln, BlockNumber blocknum,
 		 char *buffer);
@@ -40,58 +40,58 @@ smgrflush(int16 which, Relation reln, BlockNumber blocknum,
 extern int
 smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid,
 			 Oid relid, BlockNumber blkno, char *buffer);
-extern int		smgrnblocks(int16 which, Relation reln);
-extern int		smgrtruncate(int16 which, Relation reln, int nblocks);
-extern int		smgrcommit(void);
-extern bool		smgriswo(int16 smgrno);
+extern int	smgrnblocks(int16 which, Relation reln);
+extern int	smgrtruncate(int16 which, Relation reln, int nblocks);
+extern int	smgrcommit(void);
+extern bool smgriswo(int16 smgrno);
 
 
 
 /* internals: move me elsewhere -- ay 7/94 */
 
 /* in md.c */
-extern int		mdinit(void);
-extern int		mdcreate(Relation reln);
-extern int		mdunlink(Relation reln);
-extern int		mdextend(Relation reln, char *buffer);
-extern int		mdopen(Relation reln);
-extern int		mdclose(Relation reln);
-extern int		mdread(Relation reln, BlockNumber blocknum, char *buffer);
-extern int		mdwrite(Relation reln, BlockNumber blocknum, char *buffer);
-extern int		mdflush(Relation reln, BlockNumber blocknum, char *buffer);
+extern int	mdinit(void);
+extern int	mdcreate(Relation reln);
+extern int	mdunlink(Relation reln);
+extern int	mdextend(Relation reln, char *buffer);
+extern int	mdopen(Relation reln);
+extern int	mdclose(Relation reln);
+extern int	mdread(Relation reln, BlockNumber blocknum, char *buffer);
+extern int	mdwrite(Relation reln, BlockNumber blocknum, char *buffer);
+extern int	mdflush(Relation reln, BlockNumber blocknum, char *buffer);
 extern int
 mdblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid,
 		   BlockNumber blkno, char *buffer);
-extern int		mdnblocks(Relation reln);
-extern int		mdtruncate(Relation reln, int nblocks);
-extern int		mdcommit(void);
-extern int		mdabort(void);
+extern int	mdnblocks(Relation reln);
+extern int	mdtruncate(Relation reln, int nblocks);
+extern int	mdcommit(void);
+extern int	mdabort(void);
 
 /* mm.c */
 extern SPINLOCK MMCacheLock;
 
-extern int		mminit(void);
-extern int		mmshutdown(void);
-extern int		mmcreate(Relation reln);
-extern int		mmunlink(Relation reln);
-extern int		mmextend(Relation reln, char *buffer);
-extern int		mmopen(Relation reln);
-extern int		mmclose(Relation reln);
-extern int		mmread(Relation reln, BlockNumber blocknum, char *buffer);
-extern int		mmwrite(Relation reln, BlockNumber blocknum, char *buffer);
-extern int		mmflush(Relation reln, BlockNumber blocknum, char *buffer);
+extern int	mminit(void);
+extern int	mmshutdown(void);
+extern int	mmcreate(Relation reln);
+extern int	mmunlink(Relation reln);
+extern int	mmextend(Relation reln, char *buffer);
+extern int	mmopen(Relation reln);
+extern int	mmclose(Relation reln);
+extern int	mmread(Relation reln, BlockNumber blocknum, char *buffer);
+extern int	mmwrite(Relation reln, BlockNumber blocknum, char *buffer);
+extern int	mmflush(Relation reln, BlockNumber blocknum, char *buffer);
 extern int
 mmblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid,
 		   BlockNumber blkno, char *buffer);
-extern int		mmnblocks(Relation reln);
-extern int		mmcommit(void);
-extern int		mmabort(void);
-extern int		MMShmemSize(void);
+extern int	mmnblocks(Relation reln);
+extern int	mmcommit(void);
+extern int	mmabort(void);
+extern int	MMShmemSize(void);
 
 /* smgrtype.c */
-extern char    *smgrout(int2 i);
-extern int2		smgrin(char *s);
-extern bool		smgreq(int2 a, int2 b);
-extern bool		smgrne(int2 a, int2 b);
+extern char *smgrout(int2 i);
+extern int2 smgrin(char *s);
+extern bool smgreq(int2 a, int2 b);
+extern bool smgrne(int2 a, int2 b);
 
 #endif							/* SMGR_H */
diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h
index 0ee24b5ab4b..d41768039eb 100644
--- a/src/include/storage/spin.h
+++ b/src/include/storage/spin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: spin.h,v 1.4 1997/09/07 05:01:39 momjian Exp $
+ * $Id: spin.h,v 1.5 1997/09/08 02:39:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,11 +25,11 @@
  *
  */
 
-typedef int		SPINLOCK;
+typedef int SPINLOCK;
 
-extern bool		CreateSpinlocks(IPCKey key);
-extern bool		InitSpinLocks(int init, IPCKey key);
-extern void		SpinAcquire(SPINLOCK lock);
-extern void		SpinRelease(SPINLOCK lock);
+extern bool CreateSpinlocks(IPCKey key);
+extern bool InitSpinLocks(int init, IPCKey key);
+extern void SpinAcquire(SPINLOCK lock);
+extern void SpinRelease(SPINLOCK lock);
 
 #endif							/* SPIN_H */
diff --git a/src/include/strdup.h b/src/include/strdup.h
index 038446494c7..fd91939b03f 100644
--- a/src/include/strdup.h
+++ b/src/include/strdup.h
@@ -5,4 +5,4 @@
    The Postgres strdup() is in src/utils/strdup.c.
 */
 
-extern char    *strdup(char const *);
+extern char *strdup(char const *);
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index aa74fafbfe7..0eeda39c823 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dest.h,v 1.9 1997/09/07 05:01:42 momjian Exp $
+ * $Id: dest.h,v 1.10 1997/09/08 02:39:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,7 +53,7 @@ typedef enum
 	RemoteInternal,				/* results sent to frontend process in
 								 * internal (binary) form */
 	SPI							/* results sent to SPI manager */
-}				CommandDest;
+}			CommandDest;
 
 
 /* AttrInfo* replaced with TupleDesc, now that TupleDesc also has within it
@@ -65,15 +65,15 @@ typedef struct AttrInfo {
 } AttrInfo;
 */
 
-extern void		(*DestToFunction(CommandDest dest)) ();
-extern void		EndCommand(char *commandTag, CommandDest dest);
-extern void		SendCopyBegin(void);
-extern void		ReceiveCopyBegin(void);
-extern void		NullCommand(CommandDest dest);
+extern void (*DestToFunction(CommandDest dest)) ();
+extern void EndCommand(char *commandTag, CommandDest dest);
+extern void SendCopyBegin(void);
+extern void ReceiveCopyBegin(void);
+extern void NullCommand(CommandDest dest);
 extern void
 BeginCommand(char *pname, int operation, TupleDesc attinfo,
 			 bool isIntoRel, bool isIntoPortal, char *tag,
 			 CommandDest dest);
-extern void		UpdateCommandInfo(int operation, Oid lastoid, uint32 tuples);
+extern void UpdateCommandInfo(int operation, Oid lastoid, uint32 tuples);
 
 #endif							/* DEST_H */
diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h
index 96b5f598eac..68b6e724a3e 100644
--- a/src/include/tcop/fastpath.h
+++ b/src/include/tcop/fastpath.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fastpath.h,v 1.2 1997/09/07 05:01:46 momjian Exp $
+ * $Id: fastpath.h,v 1.3 1997/09/08 02:39:18 momjian Exp $
  *
  * NOTES
  *	  This information pulled out of tcop/fastpath.c and put
@@ -26,6 +26,6 @@
 #define VAR_LENGTH_ARG			(-5)
 #define MAX_STRING_LENGTH		256
 
-extern int		HandleFunctionRequest(void);
+extern int	HandleFunctionRequest(void);
 
 #endif							/* FASTPATH_H */
diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index 9d9117315b8..b4c72305aa6 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pquery.h,v 1.5 1997/09/07 05:01:49 momjian Exp $
+ * $Id: pquery.h,v 1.6 1997/09/08 02:39:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@ extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree,
 								  CommandDest dest);
 
 */
-extern EState  *CreateExecutorState(void);
+extern EState *CreateExecutorState(void);
 
 
 extern void
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 07a3cff98d0..86883ab642b 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.5 1997/09/07 05:01:56 momjian Exp $
+ * $Id: tcopprot.h,v 1.6 1997/09/08 02:39:20 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -22,20 +22,20 @@
 #include <parser/parse_query.h>
 
 #ifndef BOOTSTRAP_INCLUDE
-extern List    *
+extern List *
 pg_plan(char *query_string, Oid * typev, int nargs,
 		QueryTreeList ** queryListP, CommandDest dest);
-extern void		pg_eval(char *query_string, char **argv, Oid * typev, int nargs);
+extern void pg_eval(char *query_string, char **argv, Oid * typev, int nargs);
 extern void
 pg_eval_dest(char *query_string, char **argv, Oid * typev,
 			 int nargs, CommandDest dest);
 
 #endif							/* BOOTSTRAP_HEADER */
 
-extern void		handle_warn(SIGNAL_ARGS);
-extern void		die(SIGNAL_ARGS);
-extern int		PostgresMain(int argc, char *argv[]);
-extern void		ResetUsage(void);
-extern void		ShowUsage(void);
+extern void handle_warn(SIGNAL_ARGS);
+extern void die(SIGNAL_ARGS);
+extern int	PostgresMain(int argc, char *argv[]);
+extern void ResetUsage(void);
+extern void ShowUsage(void);
 
 #endif							/* tcopprotIncluded */
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index f5242ff4738..6dd5add42c5 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: utility.h,v 1.3 1997/09/07 05:01:58 momjian Exp $
+ * $Id: utility.h,v 1.4 1997/09/08 02:39:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,6 @@
 
 #include <executor/execdesc.h>
 
-extern void		ProcessUtility(Node * parsetree, CommandDest dest);
+extern void ProcessUtility(Node * parsetree, CommandDest dest);
 
 #endif							/* UTILITY_H */
diff --git a/src/include/tcop/variable.h b/src/include/tcop/variable.h
index a687d8fed6f..4792cac9656 100644
--- a/src/include/tcop/variable.h
+++ b/src/include/tcop/variable.h
@@ -2,7 +2,7 @@
  * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var'
  * statements
  *
- * $Id: variable.h,v 1.5 1997/09/07 05:02:01 momjian Exp $
+ * $Id: variable.h,v 1.6 1997/09/08 02:39:21 momjian Exp $
  *
  */
 
@@ -16,14 +16,14 @@ struct PGVariables
 {
 	struct
 	{
-		bool			euro;
+		bool		euro;
 		enum DateFormat format;
-	}				date;
+	}			date;
 };
 
 extern struct PGVariables PGVariables;
 
 /*-----------------------------------------------------------------------*/
-bool			SetPGVariable(const char *, const char *);
-bool			GetPGVariable(const char *);
-bool			ResetPGVariable(const char *);
+bool		SetPGVariable(const char *, const char *);
+bool		GetPGVariable(const char *);
+bool		ResetPGVariable(const char *);
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index f6e6a75ab5d..62e472f8e16 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.8 1997/09/07 05:02:05 momjian Exp $
+ * $Id: acl.h,v 1.9 1997/09/08 02:39:24 momjian Exp $
  *
  * NOTES
  *	  For backward-compatability purposes we have to allow there
@@ -29,14 +29,14 @@
  * AclId		system identifier for the user, group, etc.
  *				XXX currently UNIX uid for users...
  */
-typedef uint32	AclId;
+typedef uint32 AclId;
 
 #define ACL_ID_WORLD	0		/* XXX only idtype should be checked */
 
 /*
  * AclIdType	tag that describes if the AclId is a user, group, etc.
  */
-typedef uint8	AclIdType;
+typedef uint8 AclIdType;
 
 #define ACL_IDTYPE_WORLD		0x00
 #define ACL_IDTYPE_UID			0x01	/* user id - from pg_user */
@@ -48,7 +48,7 @@ typedef uint8	AclIdType;
  *				XXX should probably also stuff the modechg cruft in the
  *					high bits, too.
  */
-typedef uint8	AclMode;
+typedef uint8 AclMode;
 
 #define ACL_NO			0		/* no permissions */
 #define ACL_AP			(1<<0)	/* append */
@@ -71,10 +71,10 @@ typedef uint8	AclMode;
  */
 typedef struct AclItem
 {
-	AclId			ai_id;
-	AclIdType		ai_idtype;
-	AclMode			ai_mode;
-}				AclItem;
+	AclId		ai_id;
+	AclIdType	ai_idtype;
+	AclMode		ai_mode;
+}			AclItem;
 
 /* Note: if the size of AclItem changes,
    change the aclitem typlen in pg_type.h */
@@ -125,7 +125,7 @@ typedef ArrayType IdList;
 #define ACLCHECK_NOT_OWNER		  3
 
 /* warning messages.  set these in aclchk.c. */
-extern char    *aclcheck_error_strings[];
+extern char *aclcheck_error_strings[];
 
 /*
  * Enable ACL execution tracing and table dumps
@@ -135,12 +135,12 @@ extern char    *aclcheck_error_strings[];
 /*
  * routines used internally (parser, etc.)
  */
-extern Acl	   *aclownerdefault(AclId ownerid);
-extern Acl	   *acldefault(void);
-extern Acl	   *aclinsert3(Acl * old_acl, AclItem * mod_aip, unsigned modechg);
+extern Acl *aclownerdefault(AclId ownerid);
+extern Acl *acldefault(void);
+extern Acl *aclinsert3(Acl * old_acl, AclItem * mod_aip, unsigned modechg);
 
-extern char    *aclmakepriv(char *old_privlist, char new_priv);
-extern char    *aclmakeuser(char *user_type, char *user);
+extern char *aclmakepriv(char *old_privlist, char new_priv);
+extern char *aclmakeuser(char *user_type, char *user);
 extern ChangeACLStmt *
 makeAclStmt(char *privs, List * rel_list, char *grantee,
 			char grant_or_revoke);
@@ -148,27 +148,27 @@ makeAclStmt(char *privs, List * rel_list, char *grantee,
 /*
  * exported routines (from acl.c)
  */
-extern Acl	   *makeacl(int n);
+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 AclId	get_grosysid(char *groname);
-extern char    *get_groname(AclId grosysid);
+extern void ChangeAcl(char *relname, AclItem * mod_aip, unsigned modechg);
+extern AclId get_grosysid(char *groname);
+extern char *get_groname(AclId grosysid);
 
 /* XXX move these elsewhere -pma */
-extern int32	pg_aclcheck(char *relname, char *usename, AclMode mode);
-extern int32	pg_ownercheck(char *usename, char *value, int cacheid);
-extern int32
+extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode);
+extern int32 pg_ownercheck(char *usename, char *value, int cacheid);
+extern		int32
 pg_func_ownercheck(char *usename, char *funcname,
 				   int nargs, Oid * arglist);
-extern int32
+extern		int32
 pg_aggr_ownercheck(char *usename, char *aggname,
 				   Oid basetypeID);
 
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index e2cd808cbf9..8e8b216fd6a 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.5 1997/09/07 05:02:07 momjian Exp $
+ * $Id: array.h,v 1.6 1997/09/08 02:39:26 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -26,10 +26,10 @@
 
 typedef struct
 {
-	int				size;		/* total array size (in bytes) */
-	int				ndim;		/* # of dimensions */
-	int				flags;		/* implementation flags */
-}				ArrayType;
+	int			size;			/* total array size (in bytes) */
+	int			ndim;			/* # of dimensions */
+	int			flags;			/* implementation flags */
+}			ArrayType;
 
 /*
  * bitmask of ArrayType flags field:
@@ -99,7 +99,7 @@ typedef struct
 
 /* #if defined(irix5) */
 /* #define RETURN_NULL {*isNull = true; return(0); }*/
- /* #else*//* irix5 */
+ /* #else *//* irix5 */
 #define RETURN_NULL {*isNull = true; return(0); }
  /* #endif *//* irix5 */
 #define NAME_LEN	30
@@ -107,35 +107,35 @@ typedef struct
 
 typedef struct
 {
-	char			lo_name[NAME_LEN];
-	int				C[MAXDIM];
-}				CHUNK_INFO;
+	char		lo_name[NAME_LEN];
+	int			C[MAXDIM];
+}			CHUNK_INFO;
 
 /*
  * prototypes for functions defined in arrayfuncs.c
  */
-extern char    *array_in(char *string, Oid element_type);
-extern char    *array_out(ArrayType * v, Oid element_type);
-extern char    *array_dims(ArrayType * v, bool * isNull);
-extern Datum
+extern char *array_in(char *string, Oid element_type);
+extern char *array_out(ArrayType * v, Oid element_type);
+extern char *array_dims(ArrayType * v, bool * isNull);
+extern		Datum
 array_ref(ArrayType * array, int n, int indx[], int reftype,
 		  int elmlen, int arraylen, bool * isNull);
-extern Datum
+extern		Datum
 array_clip(ArrayType * array, int n, int upperIndx[],
 		   int lowerIndx[], int reftype, int len, bool * isNull);
-extern char    *
+extern char *
 array_set(ArrayType * array, int n, int indx[], char *dataPtr,
 		  int reftype, int elmlen, int arraylen, bool * isNull);
-extern char    *
+extern char *
 array_assgn(ArrayType * array, int n, int upperIndx[],
 			int lowerIndx[], ArrayType * newArr, int reftype,
 			int len, bool * isNull);
-extern int		array_eq(ArrayType * array1, ArrayType * array2);
+extern int	array_eq(ArrayType * array1, ArrayType * array2);
 extern int
 _LOtransfer(char **destfd, int size, int nitems, char **srcfd,
 			int isSrcLO, int isDestLO);
 
-extern char    *_array_newLO(int *fd, int flag);
+extern char *_array_newLO(int *fd, int flag);
 
 
 /*
@@ -143,20 +143,20 @@ extern char    *_array_newLO(int *fd, int flag);
  * [these names seem to be too generic. Add prefix for arrays? -- AY]
  */
 
-extern int		GetOffset(int n, int dim[], int lb[], int indx[]);
-extern int		getNitems(int n, int a[]);
-extern int		compute_size(int st[], int endp[], int n, int base);
-extern void		mda_get_offset_values(int n, int dist[], int PC[], int span[]);
-extern void		mda_get_range(int n, int span[], int st[], int endp[]);
-extern void		mda_get_prod(int n, int range[], int P[]);
-extern int		tuple2linear(int n, int tup[], int scale[]);
-extern void		array2chunk_coord(int n, int C[], int a_coord[], int c_coord[]);
-extern int		next_tuple(int n, int curr[], int span[]);
+extern int	GetOffset(int n, int dim[], int lb[], int indx[]);
+extern int	getNitems(int n, int a[]);
+extern int	compute_size(int st[], int endp[], int n, int base);
+extern void mda_get_offset_values(int n, int dist[], int PC[], int span[]);
+extern void mda_get_range(int n, int span[], int st[], int endp[]);
+extern void mda_get_prod(int n, int range[], int P[]);
+extern int	tuple2linear(int n, int tup[], int scale[]);
+extern void array2chunk_coord(int n, int C[], int a_coord[], int c_coord[]);
+extern int	next_tuple(int n, int curr[], int span[]);
 
 /*
  * prototypes for functions defined in chunk.c
  */
-extern char    *
+extern char *
 _ChunkArray(int fd, FILE * afd, int ndim, int dim[], int baseSize,
 			int *nbytes, char *chunkfile);
 extern int
diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h
index ab68c0d6087..e8235b5a3a3 100644
--- a/src/include/utils/bit.h
+++ b/src/include/utils/bit.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bit.h,v 1.2 1997/09/07 05:02:09 momjian Exp $
+ * $Id: bit.h,v 1.3 1997/09/08 02:39:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef BIT_H
 #define BIT_H
 
-typedef bits8  *BitArray;
-typedef uint32	BitIndex;
+typedef bits8 *BitArray;
+typedef uint32 BitIndex;
 
 #define BitsPerByte		8
 
@@ -22,18 +22,18 @@ typedef uint32	BitIndex;
  * BitArraySetBit --
  *		Sets (to 1) the value of a bit in a bit array.
  */
-extern void		BitArraySetBit(BitArray bitArray, BitIndex bitIndex);
+extern void BitArraySetBit(BitArray bitArray, BitIndex bitIndex);
 
 /*
  * BitArrayClearBit --
  *		Clears (to 0) the value of a bit in a bit array.
  */
-extern void		BitArrayClearBit(BitArray bitArray, BitIndex bitIndex);
+extern void BitArrayClearBit(BitArray bitArray, BitIndex bitIndex);
 
 /*
  * BitArrayBitIsSet --
  *		True iff the bit is set (1) in a bit array.
  */
-extern bool		BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex);
+extern bool BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex);
 
 #endif							/* BIT_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 05252ca01e9..cba39b62ac8 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.22 1997/09/07 05:02:11 momjian Exp $
+ * $Id: builtins.h,v 1.23 1997/09/08 02:39:32 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -29,181 +29,181 @@
  *		Defined in adt/
  */
 /* bool.c */
-extern bool		boolin(char *b);
-extern char    *boolout(long b);
-extern bool		booleq(int8 arg1, int8 arg2);
-extern bool		boolne(int8 arg1, int8 arg2);
-extern bool		boollt(int8 arg1, int8 arg2);
-extern bool		boolgt(int8 arg1, int8 arg2);
+extern bool boolin(char *b);
+extern char *boolout(long b);
+extern bool booleq(int8 arg1, int8 arg2);
+extern bool boolne(int8 arg1, int8 arg2);
+extern bool boollt(int8 arg1, int8 arg2);
+extern bool boolgt(int8 arg1, int8 arg2);
 
 /* char.c */
-extern int32	charin(char *ch);
-extern char    *charout(int32 ch);
-extern int32	cidin(char *s);
-extern char    *cidout(int32 c);
-extern char    *char16in(char *s);
-extern char    *char16out(char *s);
-extern bool		chareq(int8 arg1, int8 arg2);
-extern bool		charne(int8 arg1, int8 arg2);
-extern bool		charlt(int8 arg1, int8 arg2);
-extern bool		charle(int8 arg1, int8 arg2);
-extern bool		chargt(int8 arg1, int8 arg2);
-extern bool		charge(int8 arg1, int8 arg2);
-extern int8		charpl(int8 arg1, int8 arg2);
-extern int8		charmi(int8 arg1, int8 arg2);
-extern int8		charmul(int8 arg1, int8 arg2);
-extern int8		chardiv(int8 arg1, int8 arg2);
-extern bool		cideq(int8 arg1, int8 arg2);
-extern bool		char16eq(char *arg1, char *arg2);
-extern bool		char16ne(char *arg1, char *arg2);
-extern bool		char16lt(char *arg1, char *arg2);
-extern bool		char16le(char *arg1, char *arg2);
-extern bool		char16gt(char *arg1, char *arg2);
-extern bool		char16ge(char *arg1, char *arg2);
-extern uint16	char2in(char *s);
-extern char    *char2out(uint16 s);
-extern bool		char2eq(uint16 a, uint16 b);
-extern bool		char2ne(uint16 a, uint16 b);
-extern bool		char2lt(uint16 a, uint16 b);
-extern bool		char2le(uint16 a, uint16 b);
-extern bool		char2gt(uint16 a, uint16 b);
-extern bool		char2ge(uint16 a, uint16 b);
-extern int32	char2cmp(uint16 a, uint16 b);
-extern uint32	char4in(char *s);
-extern char    *char4out(uint32 s);
-extern bool		char4eq(uint32 a, uint32 b);
-extern bool		char4ne(uint32 a, uint32 b);
-extern bool		char4lt(uint32 a, uint32 b);
-extern bool		char4le(uint32 a, uint32 b);
-extern bool		char4gt(uint32 a, uint32 b);
-extern bool		char4ge(uint32 a, uint32 b);
-extern int32	char4cmp(uint32 a, uint32 b);
-extern char    *char8in(char *s);
-extern char    *char8out(char *s);
-extern bool		char8eq(char *arg1, char *arg2);
-extern bool		char8ne(char *arg1, char *arg2);
-extern bool		char8lt(char *arg1, char *arg2);
-extern bool		char8le(char *arg1, char *arg2);
-extern bool		char8gt(char *arg1, char *arg2);
-extern bool		char8ge(char *arg1, char *arg2);
-extern int32	char8cmp(char *arg1, char *arg2);
+extern int32 charin(char *ch);
+extern char *charout(int32 ch);
+extern int32 cidin(char *s);
+extern char *cidout(int32 c);
+extern char *char16in(char *s);
+extern char *char16out(char *s);
+extern bool chareq(int8 arg1, int8 arg2);
+extern bool charne(int8 arg1, int8 arg2);
+extern bool charlt(int8 arg1, int8 arg2);
+extern bool charle(int8 arg1, int8 arg2);
+extern bool chargt(int8 arg1, int8 arg2);
+extern bool charge(int8 arg1, int8 arg2);
+extern int8 charpl(int8 arg1, int8 arg2);
+extern int8 charmi(int8 arg1, int8 arg2);
+extern int8 charmul(int8 arg1, int8 arg2);
+extern int8 chardiv(int8 arg1, int8 arg2);
+extern bool cideq(int8 arg1, int8 arg2);
+extern bool char16eq(char *arg1, char *arg2);
+extern bool char16ne(char *arg1, char *arg2);
+extern bool char16lt(char *arg1, char *arg2);
+extern bool char16le(char *arg1, char *arg2);
+extern bool char16gt(char *arg1, char *arg2);
+extern bool char16ge(char *arg1, char *arg2);
+extern uint16 char2in(char *s);
+extern char *char2out(uint16 s);
+extern bool char2eq(uint16 a, uint16 b);
+extern bool char2ne(uint16 a, uint16 b);
+extern bool char2lt(uint16 a, uint16 b);
+extern bool char2le(uint16 a, uint16 b);
+extern bool char2gt(uint16 a, uint16 b);
+extern bool char2ge(uint16 a, uint16 b);
+extern int32 char2cmp(uint16 a, uint16 b);
+extern uint32 char4in(char *s);
+extern char *char4out(uint32 s);
+extern bool char4eq(uint32 a, uint32 b);
+extern bool char4ne(uint32 a, uint32 b);
+extern bool char4lt(uint32 a, uint32 b);
+extern bool char4le(uint32 a, uint32 b);
+extern bool char4gt(uint32 a, uint32 b);
+extern bool char4ge(uint32 a, uint32 b);
+extern int32 char4cmp(uint32 a, uint32 b);
+extern char *char8in(char *s);
+extern char *char8out(char *s);
+extern bool char8eq(char *arg1, char *arg2);
+extern bool char8ne(char *arg1, char *arg2);
+extern bool char8lt(char *arg1, char *arg2);
+extern bool char8le(char *arg1, char *arg2);
+extern bool char8gt(char *arg1, char *arg2);
+extern bool char8ge(char *arg1, char *arg2);
+extern int32 char8cmp(char *arg1, char *arg2);
 
 /* int.c */
-extern int32	int2in(char *num);
-extern char    *int2out(int16 sh);
-extern int16   *int28in(char *shs);
-extern char    *int28out(int16(*shs)[]);
-extern int32   *int44in(char *input_string);
-extern char    *int44out(int32 an_array[]);
-extern int32	int4in(char *num);
-extern char    *int4out(int32 l);
-extern int32	i2toi4(int16 arg1);
-extern int16	i4toi2(int32 arg1);
-extern bool		int4eq(int32 arg1, int32 arg2);
-extern bool		int4ne(int32 arg1, int32 arg2);
-extern bool		int4lt(int32 arg1, int32 arg2);
-extern bool		int4le(int32 arg1, int32 arg2);
-extern bool		int4gt(int32 arg1, int32 arg2);
-extern bool		int4ge(int32 arg1, int32 arg2);
-extern bool		int2eq(int16 arg1, int16 arg2);
-extern bool		int2ne(int16 arg1, int16 arg2);
-extern bool		int2lt(int16 arg1, int16 arg2);
-extern bool		int2le(int16 arg1, int16 arg2);
-extern bool		int2gt(int16 arg1, int16 arg2);
-extern bool		int2ge(int16 arg1, int16 arg2);
-extern bool		int24eq(int32 arg1, int32 arg2);
-extern bool		int24ne(int32 arg1, int32 arg2);
-extern bool		int24lt(int32 arg1, int32 arg2);
-extern bool		int24le(int32 arg1, int32 arg2);
-extern bool		int24gt(int32 arg1, int32 arg2);
-extern bool		int24ge(int32 arg1, int32 arg2);
-extern bool		int42eq(int32 arg1, int32 arg2);
-extern bool		int42ne(int32 arg1, int32 arg2);
-extern bool		int42lt(int32 arg1, int32 arg2);
-extern bool		int42le(int32 arg1, int32 arg2);
-extern bool		int42gt(int32 arg1, int32 arg2);
-extern bool		int42ge(int32 arg1, int32 arg2);
-extern bool		keyfirsteq(int16 * arg1, int16 arg2);
-extern int32	int4um(int32 arg);
-extern int32	int4pl(int32 arg1, int32 arg2);
-extern int32	int4mi(int32 arg1, int32 arg2);
-extern int32	int4mul(int32 arg1, int32 arg2);
-extern int32	int4div(int32 arg1, int32 arg2);
-extern int32	int4inc(int32 arg);
-extern int16	int2um(int16 arg);
-extern int16	int2pl(int16 arg1, int16 arg2);
-extern int16	int2mi(int16 arg1, int16 arg2);
-extern int16	int2mul(int16 arg1, int16 arg2);
-extern int16	int2div(int16 arg1, int16 arg2);
-extern int16	int2inc(int16 arg);
-extern int32	int24pl(int32 arg1, int32 arg2);
-extern int32	int24mi(int32 arg1, int32 arg2);
-extern int32	int24mul(int32 arg1, int32 arg2);
-extern int32	int24div(int32 arg1, int32 arg2);
-extern int32	int42pl(int32 arg1, int32 arg2);
-extern int32	int42mi(int32 arg1, int32 arg2);
-extern int32	int42mul(int32 arg1, int32 arg2);
-extern int32	int42div(int32 arg1, int32 arg2);
-extern int32	int4mod(int32 arg1, int32 arg2);
-extern int32	int2mod(int16 arg1, int16 arg2);
-extern int32	int24mod(int32 arg1, int32 arg2);
-extern int32	int42mod(int32 arg1, int32 arg2);
-extern int32	int4fac(int32 arg1);
-extern int32	int2fac(int16 arg1);
-extern int16	int2larger(int16 arg1, int16 arg2);
-extern int16	int2smaller(int16 arg1, int16 arg2);
-extern int32	int4larger(int32 arg1, int32 arg2);
-extern int32	int4smaller(int32 arg1, int32 arg2);
+extern int32 int2in(char *num);
+extern char *int2out(int16 sh);
+extern int16 *int28in(char *shs);
+extern char *int28out(int16(*shs)[]);
+extern int32 *int44in(char *input_string);
+extern char *int44out(int32 an_array[]);
+extern int32 int4in(char *num);
+extern char *int4out(int32 l);
+extern int32 i2toi4(int16 arg1);
+extern int16 i4toi2(int32 arg1);
+extern bool int4eq(int32 arg1, int32 arg2);
+extern bool int4ne(int32 arg1, int32 arg2);
+extern bool int4lt(int32 arg1, int32 arg2);
+extern bool int4le(int32 arg1, int32 arg2);
+extern bool int4gt(int32 arg1, int32 arg2);
+extern bool int4ge(int32 arg1, int32 arg2);
+extern bool int2eq(int16 arg1, int16 arg2);
+extern bool int2ne(int16 arg1, int16 arg2);
+extern bool int2lt(int16 arg1, int16 arg2);
+extern bool int2le(int16 arg1, int16 arg2);
+extern bool int2gt(int16 arg1, int16 arg2);
+extern bool int2ge(int16 arg1, int16 arg2);
+extern bool int24eq(int32 arg1, int32 arg2);
+extern bool int24ne(int32 arg1, int32 arg2);
+extern bool int24lt(int32 arg1, int32 arg2);
+extern bool int24le(int32 arg1, int32 arg2);
+extern bool int24gt(int32 arg1, int32 arg2);
+extern bool int24ge(int32 arg1, int32 arg2);
+extern bool int42eq(int32 arg1, int32 arg2);
+extern bool int42ne(int32 arg1, int32 arg2);
+extern bool int42lt(int32 arg1, int32 arg2);
+extern bool int42le(int32 arg1, int32 arg2);
+extern bool int42gt(int32 arg1, int32 arg2);
+extern bool int42ge(int32 arg1, int32 arg2);
+extern bool keyfirsteq(int16 * arg1, int16 arg2);
+extern int32 int4um(int32 arg);
+extern int32 int4pl(int32 arg1, int32 arg2);
+extern int32 int4mi(int32 arg1, int32 arg2);
+extern int32 int4mul(int32 arg1, int32 arg2);
+extern int32 int4div(int32 arg1, int32 arg2);
+extern int32 int4inc(int32 arg);
+extern int16 int2um(int16 arg);
+extern int16 int2pl(int16 arg1, int16 arg2);
+extern int16 int2mi(int16 arg1, int16 arg2);
+extern int16 int2mul(int16 arg1, int16 arg2);
+extern int16 int2div(int16 arg1, int16 arg2);
+extern int16 int2inc(int16 arg);
+extern int32 int24pl(int32 arg1, int32 arg2);
+extern int32 int24mi(int32 arg1, int32 arg2);
+extern int32 int24mul(int32 arg1, int32 arg2);
+extern int32 int24div(int32 arg1, int32 arg2);
+extern int32 int42pl(int32 arg1, int32 arg2);
+extern int32 int42mi(int32 arg1, int32 arg2);
+extern int32 int42mul(int32 arg1, int32 arg2);
+extern int32 int42div(int32 arg1, int32 arg2);
+extern int32 int4mod(int32 arg1, int32 arg2);
+extern int32 int2mod(int16 arg1, int16 arg2);
+extern int32 int24mod(int32 arg1, int32 arg2);
+extern int32 int42mod(int32 arg1, int32 arg2);
+extern int32 int4fac(int32 arg1);
+extern int32 int2fac(int16 arg1);
+extern int16 int2larger(int16 arg1, int16 arg2);
+extern int16 int2smaller(int16 arg1, int16 arg2);
+extern int32 int4larger(int32 arg1, int32 arg2);
+extern int32 int4smaller(int32 arg1, int32 arg2);
 
 /* name.c */
 extern NameData *namein(char *s);
-extern char    *nameout(NameData * s);
-extern bool		nameeq(NameData * arg1, NameData * arg2);
-extern bool		namene(NameData * arg1, NameData * arg2);
-extern bool		namelt(NameData * arg1, NameData * arg2);
-extern bool		namele(NameData * arg1, NameData * arg2);
-extern bool		namegt(NameData * arg1, NameData * arg2);
-extern bool		namege(NameData * arg1, NameData * arg2);
-extern int		namecmp(Name n1, Name n2);
-extern int		namecpy(Name n1, Name n2);
-extern int		namestrcpy(Name name, char *str);
-extern int		namestrcmp(Name name, char *str);
+extern char *nameout(NameData * s);
+extern bool nameeq(NameData * arg1, NameData * arg2);
+extern bool namene(NameData * arg1, NameData * arg2);
+extern bool namelt(NameData * arg1, NameData * arg2);
+extern bool namele(NameData * arg1, NameData * arg2);
+extern bool namegt(NameData * arg1, NameData * arg2);
+extern bool namege(NameData * arg1, NameData * arg2);
+extern int	namecmp(Name n1, Name n2);
+extern int	namecpy(Name n1, Name n2);
+extern int	namestrcpy(Name name, char *str);
+extern int	namestrcmp(Name name, char *str);
 
 /* numutils.c */
 /* XXX hack.  HP-UX has a ltoa (with different arguments) already. */
 #ifdef hpux
 #define ltoa pg_ltoa
 #endif							/* hpux */
-extern int32	pg_atoi(char *s, int size, int c);
-extern void		itoa(int i, char *a);
-extern void		ltoa(int32 l, char *a);
+extern int32 pg_atoi(char *s, int size, int c);
+extern void itoa(int i, char *a);
+extern void ltoa(int32 l, char *a);
 
 /*
  *		Per-opclass comparison functions for new btrees.  These are
  *		stored in pg_amproc and defined in nbtree/
  */
-extern int32	btint2cmp(int16 a, int16 b);
-extern int32	btint4cmp(int32 a, int32 b);
-extern int32	btint24cmp(int16 a, int32 b);
-extern int32	btint42cmp(int32 a, int16 b);
-extern int32	btfloat4cmp(float32 a, float32 b);
-extern int32	btfloat8cmp(float64 a, float64 b);
-extern int32	btoidcmp(Oid a, Oid b);
-extern int32	btabstimecmp(AbsoluteTime a, AbsoluteTime b);
-extern int32	btcharcmp(char a, char b);
-extern int32	btchar2cmp(uint16 a, uint16 b);
-extern int32	btchar4cmp(uint32 a, uint32 b);
-extern int32	btchar8cmp(char *a, char *b);
-extern int32	btchar16cmp(char *a, char *b);
-extern int32	btnamecmp(NameData * a, NameData * b);
-extern int32	bttextcmp(struct varlena * a, struct varlena * b);
+extern int32 btint2cmp(int16 a, int16 b);
+extern int32 btint4cmp(int32 a, int32 b);
+extern int32 btint24cmp(int16 a, int32 b);
+extern int32 btint42cmp(int32 a, int16 b);
+extern int32 btfloat4cmp(float32 a, float32 b);
+extern int32 btfloat8cmp(float64 a, float64 b);
+extern int32 btoidcmp(Oid a, Oid b);
+extern int32 btabstimecmp(AbsoluteTime a, AbsoluteTime b);
+extern int32 btcharcmp(char a, char b);
+extern int32 btchar2cmp(uint16 a, uint16 b);
+extern int32 btchar4cmp(uint32 a, uint32 b);
+extern int32 btchar8cmp(char *a, char *b);
+extern int32 btchar16cmp(char *a, char *b);
+extern int32 btnamecmp(NameData * a, NameData * b);
+extern int32 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 void		rt_poly_size(POLYGON * 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);
 
@@ -213,15 +213,15 @@ extern POLYGON *rt_poly_inter(POLYGON * a, POLYGON * b);
  in executor/executor.h*/
 
 
-extern int32	pqtest(struct varlena * vlena);
+extern int32 pqtest(struct varlena * vlena);
 
 /* arrayfuncs.c */
 
 /* date.c */
-extern int32	reltimein(char *timestring);
-extern char    *reltimeout(int32 timevalue);
+extern int32 reltimein(char *timestring);
+extern char *reltimeout(int32 timevalue);
 extern TimeInterval tintervalin(char *intervalstr);
-extern char    *tintervalout(TimeInterval interval);
+extern char *tintervalout(TimeInterval interval);
 extern RelativeTime timespan_reltime(TimeSpan * timespan);
 extern TimeSpan *reltime_timespan(RelativeTime reltime);
 extern TimeInterval mktinterval(AbsoluteTime t1, AbsoluteTime t2);
@@ -229,309 +229,309 @@ extern AbsoluteTime timepl(AbsoluteTime t1, RelativeTime t2);
 extern AbsoluteTime timemi(AbsoluteTime t1, RelativeTime t2);
 
 /* extern RelativeTime abstimemi(AbsoluteTime t1, AbsoluteTime t2);  static*/
-extern int		ininterval(AbsoluteTime t, TimeInterval interval);
+extern int	ininterval(AbsoluteTime t, TimeInterval interval);
 extern RelativeTime intervalrel(TimeInterval interval);
 extern AbsoluteTime timenow(void);
-extern bool		reltimeeq(RelativeTime t1, RelativeTime t2);
-extern bool		reltimene(RelativeTime t1, RelativeTime t2);
-extern bool		reltimelt(RelativeTime t1, RelativeTime t2);
-extern bool		reltimegt(RelativeTime t1, RelativeTime t2);
-extern bool		reltimele(RelativeTime t1, RelativeTime t2);
-extern bool		reltimege(RelativeTime t1, RelativeTime t2);
-extern bool		intervaleq(TimeInterval i1, TimeInterval i2);
-extern bool		intervalleneq(TimeInterval i, RelativeTime t);
-extern bool		intervallenne(TimeInterval i, RelativeTime t);
-extern bool		intervallenlt(TimeInterval i, RelativeTime t);
-extern bool		intervallengt(TimeInterval i, RelativeTime t);
-extern bool		intervallenle(TimeInterval i, RelativeTime t);
-extern bool		intervallenge(TimeInterval i, RelativeTime t);
-extern bool		intervalct(TimeInterval i1, TimeInterval i2);
-extern bool		intervalov(TimeInterval i1, TimeInterval i2);
+extern bool reltimeeq(RelativeTime t1, RelativeTime t2);
+extern bool reltimene(RelativeTime t1, RelativeTime t2);
+extern bool reltimelt(RelativeTime t1, RelativeTime t2);
+extern bool reltimegt(RelativeTime t1, RelativeTime t2);
+extern bool reltimele(RelativeTime t1, RelativeTime t2);
+extern bool reltimege(RelativeTime t1, RelativeTime t2);
+extern bool intervaleq(TimeInterval i1, TimeInterval i2);
+extern bool intervalleneq(TimeInterval i, RelativeTime t);
+extern bool intervallenne(TimeInterval i, RelativeTime t);
+extern bool intervallenlt(TimeInterval i, RelativeTime t);
+extern bool intervallengt(TimeInterval i, RelativeTime t);
+extern bool intervallenle(TimeInterval i, RelativeTime t);
+extern bool intervallenge(TimeInterval i, RelativeTime t);
+extern bool intervalct(TimeInterval i1, TimeInterval i2);
+extern bool intervalov(TimeInterval i1, TimeInterval i2);
 extern AbsoluteTime intervalstart(TimeInterval i);
 extern AbsoluteTime intervalend(TimeInterval i);
-extern int		isreltime(char *timestring);
-extern text    *timeofday(void);
+extern int	isreltime(char *timestring);
+extern text *timeofday(void);
 
 /* dt.c */
 extern DateTime *datetime_in(char *str);
-extern char    *datetime_out(DateTime * datetime);
+extern char *datetime_out(DateTime * datetime);
 extern TimeSpan *timespan_in(char *str);
-extern char    *timespan_out(TimeSpan * timespan);
-extern int		datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
+extern char *timespan_out(TimeSpan * timespan);
+extern int	datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
 
 /* filename.c */
-extern char    *filename_in(char *file);
-extern char    *filename_out(char *s);
+extern char *filename_in(char *file);
+extern char *filename_out(char *s);
 
 /* float.c */
-extern void		CheckFloat8Val(double val);		/* used by lex */
-extern float32	float4in(char *num);
-extern char    *float4out(float32 num);
-extern float64	float8in(char *num);
-extern char    *float8out(float64 num);
-extern float32	float4abs(float32 arg1);
-extern float32	float4um(float32 arg1);
-extern float32	float4larger(float32 arg1, float32 arg2);
-extern float32	float4smaller(float32 arg1, float32 arg2);
-extern float64	float8abs(float64 arg1);
-extern float64	float8um(float64 arg1);
-extern float64	float8larger(float64 arg1, float64 arg2);
-extern float64	float8smaller(float64 arg1, float64 arg2);
-extern float32	float4pl(float32 arg1, float32 arg2);
-extern float32	float4mi(float32 arg1, float32 arg2);
-extern float32	float4mul(float32 arg1, float32 arg2);
-extern float32	float4div(float32 arg1, float32 arg2);
-extern float32	float4inc(float32 arg1);
-extern float64	float8pl(float64 arg1, float64 arg2);
-extern float64	float8mi(float64 arg1, float64 arg2);
-extern float64	float8mul(float64 arg1, float64 arg2);
-extern float64	float8div(float64 arg1, float64 arg2);
-extern float64	float8inc(float64 arg1);
-extern bool		float4eq(float32 arg1, float32 arg2);
-extern bool		float4ne(float32 arg1, float32 arg2);
-extern bool		float4lt(float32 arg1, float32 arg2);
-extern bool		float4le(float32 arg1, float32 arg2);
-extern bool		float4gt(float32 arg1, float32 arg2);
-extern bool		float4ge(float32 arg1, float32 arg2);
-extern bool		float8eq(float64 arg1, float64 arg2);
-extern bool		float8ne(float64 arg1, float64 arg2);
-extern bool		float8lt(float64 arg1, float64 arg2);
-extern bool		float8le(float64 arg1, float64 arg2);
-extern bool		float8gt(float64 arg1, float64 arg2);
-extern bool		float8ge(float64 arg1, float64 arg2);
-extern float64	ftod(float32 num);
-extern float64	i4tod(int32 num);
-extern float64	i2tod(int16 num);
-extern float32	dtof(float64 num);
-extern int32	dtoi4(float64 num);
-extern int16	dtoi2(float64 num);
-extern float32	i4tof(int32 num);
-extern float32	i2tof(int16 num);
-extern int32	ftoi4(float32 num);
-extern int16	ftoi2(float32 num);
-extern float64	dround(float64 arg1);
-extern float64	dtrunc(float64 arg1);
-extern float64	dsqrt(float64 arg1);
-extern float64	dcbrt(float64 arg1);
-extern float64	dpow(float64 arg1, float64 arg2);
-extern float64	dexp(float64 arg1);
-extern float64	dlog1(float64 arg1);
-extern float64	float48pl(float32 arg1, float64 arg2);
-extern float64	float48mi(float32 arg1, float64 arg2);
-extern float64	float48mul(float32 arg1, float64 arg2);
-extern float64	float48div(float32 arg1, float64 arg2);
-extern float64	float84pl(float64 arg1, float32 arg2);
-extern float64	float84mi(float64 arg1, float32 arg2);
-extern float64	float84mul(float64 arg1, float32 arg2);
-extern float64	float84div(float64 arg1, float32 arg2);
-extern bool		float48eq(float32 arg1, float64 arg2);
-extern bool		float48ne(float32 arg1, float64 arg2);
-extern bool		float48lt(float32 arg1, float64 arg2);
-extern bool		float48le(float32 arg1, float64 arg2);
-extern bool		float48gt(float32 arg1, float64 arg2);
-extern bool		float48ge(float32 arg1, float64 arg2);
-extern bool		float84eq(float64 arg1, float32 arg2);
-extern bool		float84ne(float64 arg1, float32 arg2);
-extern bool		float84lt(float64 arg1, float32 arg2);
-extern bool		float84le(float64 arg1, float32 arg2);
-extern bool		float84gt(float64 arg1, float32 arg2);
-extern bool		float84ge(float64 arg1, float32 arg2);
+extern void CheckFloat8Val(double val); /* used by lex */
+extern float32 float4in(char *num);
+extern char *float4out(float32 num);
+extern float64 float8in(char *num);
+extern char *float8out(float64 num);
+extern float32 float4abs(float32 arg1);
+extern float32 float4um(float32 arg1);
+extern float32 float4larger(float32 arg1, float32 arg2);
+extern float32 float4smaller(float32 arg1, float32 arg2);
+extern float64 float8abs(float64 arg1);
+extern float64 float8um(float64 arg1);
+extern float64 float8larger(float64 arg1, float64 arg2);
+extern float64 float8smaller(float64 arg1, float64 arg2);
+extern float32 float4pl(float32 arg1, float32 arg2);
+extern float32 float4mi(float32 arg1, float32 arg2);
+extern float32 float4mul(float32 arg1, float32 arg2);
+extern float32 float4div(float32 arg1, float32 arg2);
+extern float32 float4inc(float32 arg1);
+extern float64 float8pl(float64 arg1, float64 arg2);
+extern float64 float8mi(float64 arg1, float64 arg2);
+extern float64 float8mul(float64 arg1, float64 arg2);
+extern float64 float8div(float64 arg1, float64 arg2);
+extern float64 float8inc(float64 arg1);
+extern bool float4eq(float32 arg1, float32 arg2);
+extern bool float4ne(float32 arg1, float32 arg2);
+extern bool float4lt(float32 arg1, float32 arg2);
+extern bool float4le(float32 arg1, float32 arg2);
+extern bool float4gt(float32 arg1, float32 arg2);
+extern bool float4ge(float32 arg1, float32 arg2);
+extern bool float8eq(float64 arg1, float64 arg2);
+extern bool float8ne(float64 arg1, float64 arg2);
+extern bool float8lt(float64 arg1, float64 arg2);
+extern bool float8le(float64 arg1, float64 arg2);
+extern bool float8gt(float64 arg1, float64 arg2);
+extern bool float8ge(float64 arg1, float64 arg2);
+extern float64 ftod(float32 num);
+extern float64 i4tod(int32 num);
+extern float64 i2tod(int16 num);
+extern float32 dtof(float64 num);
+extern int32 dtoi4(float64 num);
+extern int16 dtoi2(float64 num);
+extern float32 i4tof(int32 num);
+extern float32 i2tof(int16 num);
+extern int32 ftoi4(float32 num);
+extern int16 ftoi2(float32 num);
+extern float64 dround(float64 arg1);
+extern float64 dtrunc(float64 arg1);
+extern float64 dsqrt(float64 arg1);
+extern float64 dcbrt(float64 arg1);
+extern float64 dpow(float64 arg1, float64 arg2);
+extern float64 dexp(float64 arg1);
+extern float64 dlog1(float64 arg1);
+extern float64 float48pl(float32 arg1, float64 arg2);
+extern float64 float48mi(float32 arg1, float64 arg2);
+extern float64 float48mul(float32 arg1, float64 arg2);
+extern float64 float48div(float32 arg1, float64 arg2);
+extern float64 float84pl(float64 arg1, float32 arg2);
+extern float64 float84mi(float64 arg1, float32 arg2);
+extern float64 float84mul(float64 arg1, float32 arg2);
+extern float64 float84div(float64 arg1, float32 arg2);
+extern bool float48eq(float32 arg1, float64 arg2);
+extern bool float48ne(float32 arg1, float64 arg2);
+extern bool float48lt(float32 arg1, float64 arg2);
+extern bool float48le(float32 arg1, float64 arg2);
+extern bool float48gt(float32 arg1, float64 arg2);
+extern bool float48ge(float32 arg1, float64 arg2);
+extern bool float84eq(float64 arg1, float32 arg2);
+extern bool float84ne(float64 arg1, float32 arg2);
+extern bool float84lt(float64 arg1, float32 arg2);
+extern bool float84le(float64 arg1, float32 arg2);
+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);
-extern bool		nonnullvalue(Datum value, bool * isNull);
-extern bool		oidrand(Oid o, int32 X);
-extern bool		oidsrand(int32 X);
-extern int32	userfntest(int i);
+extern bool nullvalue(Datum value, bool * isNull);
+extern bool nonnullvalue(Datum value, bool * isNull);
+extern bool oidrand(Oid o, int32 X);
+extern bool oidsrand(int32 X);
+extern int32 userfntest(int i);
 
 /* define macros to replace mixed-case function calls - tgl 97/04/27 */
 #define NullValue(v,b) nullvalue(v,b)
 #define NonNullValue(v,b) nonnullvalue(v,b)
 
 /* not_in.c */
-extern bool		int4notin(int16 not_in_arg, char *relation_and_attr);
-extern bool		oidnotin(Oid the_oid, char *compare);
+extern bool int4notin(int16 not_in_arg, char *relation_and_attr);
+extern bool oidnotin(Oid the_oid, char *compare);
 
 /* oid.c */
-extern Oid	   *oid8in(char *oidString);
-extern char    *oid8out(Oid(*oidArray)[]);
-extern Oid		oidin(char *s);
-extern char    *oidout(Oid o);
-extern bool		oideq(Oid arg1, Oid arg2);
-extern bool		oidne(Oid arg1, Oid arg2);
-extern bool		oid8eq(Oid arg1[], Oid arg2[]);
-extern bool		oideqint4(Oid arg1, int32 arg2);
-extern bool		int4eqoid(int32 arg1, Oid arg2);
+extern Oid *oid8in(char *oidString);
+extern char *oid8out(Oid(*oidArray)[]);
+extern Oid	oidin(char *s);
+extern char *oidout(Oid o);
+extern bool oideq(Oid arg1, Oid arg2);
+extern bool oidne(Oid arg1, Oid arg2);
+extern bool oid8eq(Oid arg1[], Oid arg2[]);
+extern bool oideqint4(Oid arg1, int32 arg2);
+extern bool int4eqoid(int32 arg1, Oid arg2);
 
 /* regexp.c */
-extern bool		char2regexeq(uint16 arg1, struct varlena * p);
-extern bool		char2regexne(uint16 arg1, struct varlena * p);
-extern bool		char4regexeq(uint32 arg1, struct varlena * p);
-extern bool		char4regexne(uint32 arg1, struct varlena * p);
-extern bool		char8regexeq(char *s, struct varlena * p);
-extern bool		char8regexne(char *s, struct varlena * p);
-extern bool		char16regexeq(char *s, struct varlena * p);
-extern bool		char16regexne(char *s, struct varlena * p);
-extern bool		nameregexeq(NameData * n, struct varlena * p);
-extern bool		nameregexne(NameData * s, struct varlena * p);
-extern bool		textregexeq(struct varlena * s, struct varlena * p);
-extern bool		textregexne(struct varlena * s, struct varlena * p);
-extern bool		char2icregexeq(uint16 arg1, struct varlena * p);
-extern bool		char2icregexne(uint16 arg1, struct varlena * p);
-extern bool		char4icregexeq(uint32 arg1, struct varlena * p);
-extern bool		char4icregexne(uint32 arg1, struct varlena * p);
-extern bool		char8icregexeq(char *s, struct varlena * p);
-extern bool		char8icregexne(char *s, struct varlena * p);
-extern bool		char16icregexeq(char *s, struct varlena * p);
-extern bool		char16icregexne(char *s, struct varlena * p);
-extern bool		nameicregexeq(NameData * s, struct varlena * p);
-extern bool		nameicregexne(NameData * s, struct varlena * p);
-extern bool		texticregexeq(struct varlena * s, struct varlena * p);
-extern bool		texticregexne(struct varlena * s, struct varlena * p);
+extern bool char2regexeq(uint16 arg1, struct varlena * p);
+extern bool char2regexne(uint16 arg1, struct varlena * p);
+extern bool char4regexeq(uint32 arg1, struct varlena * p);
+extern bool char4regexne(uint32 arg1, struct varlena * p);
+extern bool char8regexeq(char *s, struct varlena * p);
+extern bool char8regexne(char *s, struct varlena * p);
+extern bool char16regexeq(char *s, struct varlena * p);
+extern bool char16regexne(char *s, struct varlena * p);
+extern bool nameregexeq(NameData * n, struct varlena * p);
+extern bool nameregexne(NameData * s, struct varlena * p);
+extern bool textregexeq(struct varlena * s, struct varlena * p);
+extern bool textregexne(struct varlena * s, struct varlena * p);
+extern bool char2icregexeq(uint16 arg1, struct varlena * p);
+extern bool char2icregexne(uint16 arg1, struct varlena * p);
+extern bool char4icregexeq(uint32 arg1, struct varlena * p);
+extern bool char4icregexne(uint32 arg1, struct varlena * p);
+extern bool char8icregexeq(char *s, struct varlena * p);
+extern bool char8icregexne(char *s, struct varlena * p);
+extern bool char16icregexeq(char *s, struct varlena * p);
+extern bool char16icregexne(char *s, struct varlena * p);
+extern bool nameicregexeq(NameData * s, struct varlena * p);
+extern bool nameicregexne(NameData * s, struct varlena * p);
+extern bool texticregexeq(struct varlena * s, struct varlena * p);
+extern bool texticregexne(struct varlena * s, struct varlena * p);
 
 
 /* regproc.c */
-extern int32	regprocin(char *proname);
-extern char    *regprocout(RegProcedure proid);
-extern Oid		regproctooid(RegProcedure rp);
+extern int32 regprocin(char *proname);
+extern char *regprocout(RegProcedure proid);
+extern Oid	regproctooid(RegProcedure rp);
 
 /* define macro to replace mixed-case function call - tgl 97/04/27 */
 #define RegprocToOid(rp) regproctooid(rp)
 
 /* selfuncs.c */
-extern float64	eqsel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag);
-extern float64	neqsel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag);
-extern float64	intltsel(Oid opid, Oid relid, AttrNumber attno, int32 value, int32 flag);
-extern float64	intgtsel(Oid opid, Oid relid, AttrNumber attno, int32 value, int32 flag);
-extern float64	eqjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid relid2, AttrNumber attno2);
-extern float64	neqjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid relid2, AttrNumber attno2);
-extern float64	intltjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid relid2, AttrNumber attno2);
-extern float64	intgtjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid relid2, AttrNumber attno2);
-extern float64	btreesel(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
-extern float64	btreenpage(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
-extern float64	hashsel(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
-extern float64	hashnpage(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
-extern float64	rtsel(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
-extern float64	rtnpage(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
-extern float64	gistsel(Oid operatorObjectId, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
-extern float64	gistnpage(Oid operatorObjectId, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
+extern float64 eqsel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag);
+extern float64 neqsel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag);
+extern float64 intltsel(Oid opid, Oid relid, AttrNumber attno, int32 value, int32 flag);
+extern float64 intgtsel(Oid opid, Oid relid, AttrNumber attno, int32 value, int32 flag);
+extern float64 eqjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid relid2, AttrNumber attno2);
+extern float64 neqjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid relid2, AttrNumber attno2);
+extern float64 intltjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid relid2, AttrNumber attno2);
+extern float64 intgtjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid relid2, AttrNumber attno2);
+extern float64 btreesel(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
+extern float64 btreenpage(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
+extern float64 hashsel(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
+extern float64 hashnpage(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
+extern float64 rtsel(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
+extern float64 rtnpage(Oid operatorOid, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
+extern float64 gistsel(Oid operatorObjectId, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
+extern float64 gistnpage(Oid operatorObjectId, Oid indrelid, AttrNumber attributeNumber, char *constValue, int32 constFlag, int32 nIndexKeys, Oid indexrelid);
 
 /* tid.c */
 extern ItemPointer tidin(char *str);
-extern char    *tidout(ItemPointer itemPtr);
+extern char *tidout(ItemPointer itemPtr);
 
 /* timestamp.c */
-extern time_t	timestamp_in(const char *timestamp_str);
-extern char    *timestamp_out(time_t timestamp);
-extern time_t	now(void);
-bool			timestampeq(time_t t1, time_t t2);
-bool			timestampne(time_t t1, time_t t2);
-bool			timestamplt(time_t t1, time_t t2);
-bool			timestampgt(time_t t1, time_t t2);
-bool			timestample(time_t t1, time_t t2);
-bool			timestampge(time_t t1, time_t t2);
-DateTime	   *timestamp_datetime(time_t timestamp);
+extern time_t timestamp_in(const char *timestamp_str);
+extern char *timestamp_out(time_t timestamp);
+extern time_t now(void);
+bool		timestampeq(time_t t1, time_t t2);
+bool		timestampne(time_t t1, time_t t2);
+bool		timestamplt(time_t t1, time_t t2);
+bool		timestampgt(time_t t1, time_t t2);
+bool		timestample(time_t t1, time_t t2);
+bool		timestampge(time_t t1, time_t t2);
+DateTime   *timestamp_datetime(time_t timestamp);
 
 /* varchar.c */
-extern char    *bpcharin(char *s, int dummy, int typlen);
-extern char    *bpcharout(char *s);
-extern char    *varcharin(char *s, int dummy, int typlen);
-extern char    *varcharout(char *s);
-extern bool		bpchareq(char *arg1, char *arg2);
-extern bool		bpcharne(char *arg1, char *arg2);
-extern bool		bpcharlt(char *arg1, char *arg2);
-extern bool		bpcharle(char *arg1, char *arg2);
-extern bool		bpchargt(char *arg1, char *arg2);
-extern bool		bpcharge(char *arg1, char *arg2);
-extern int32	bpcharcmp(char *arg1, char *arg2);
-extern bool		varchareq(char *arg1, char *arg2);
-extern bool		varcharne(char *arg1, char *arg2);
-extern bool		varcharlt(char *arg1, char *arg2);
-extern bool		varcharle(char *arg1, char *arg2);
-extern bool		varchargt(char *arg1, char *arg2);
-extern bool		varcharge(char *arg1, char *arg2);
-extern int32	varcharcmp(char *arg1, char *arg2);
-extern uint32	hashbpchar(struct varlena * key);
-extern uint32	hashvarchar(struct varlena * key);
+extern char *bpcharin(char *s, int dummy, int typlen);
+extern char *bpcharout(char *s);
+extern char *varcharin(char *s, int dummy, int typlen);
+extern char *varcharout(char *s);
+extern bool bpchareq(char *arg1, char *arg2);
+extern bool bpcharne(char *arg1, char *arg2);
+extern bool bpcharlt(char *arg1, char *arg2);
+extern bool bpcharle(char *arg1, char *arg2);
+extern bool bpchargt(char *arg1, char *arg2);
+extern bool bpcharge(char *arg1, char *arg2);
+extern int32 bpcharcmp(char *arg1, char *arg2);
+extern bool varchareq(char *arg1, char *arg2);
+extern bool varcharne(char *arg1, char *arg2);
+extern bool varcharlt(char *arg1, char *arg2);
+extern bool varcharle(char *arg1, char *arg2);
+extern bool varchargt(char *arg1, char *arg2);
+extern bool varcharge(char *arg1, char *arg2);
+extern int32 varcharcmp(char *arg1, char *arg2);
+extern uint32 hashbpchar(struct varlena * key);
+extern uint32 hashvarchar(struct varlena * key);
 
 /* varlena.c */
 extern struct varlena *byteain(char *inputText);
-extern char    *byteaout(struct varlena * vlena);
+extern char *byteaout(struct varlena * vlena);
 extern struct varlena *textin(char *inputText);
-extern char    *textout(struct varlena * vlena);
-extern text    *textcat(text * t1, text * t2);
-extern bool		texteq(struct varlena * arg1, struct varlena * arg2);
-extern bool		textne(struct varlena * arg1, struct varlena * arg2);
-extern bool		text_lt(struct varlena * arg1, struct varlena * arg2);
-extern bool		text_le(struct varlena * arg1, struct varlena * arg2);
-extern bool		text_gt(struct varlena * arg1, struct varlena * arg2);
-extern bool		text_ge(struct varlena * arg1, struct varlena * arg2);
-extern int32	textpos(text * t1, text * t2);
-extern int32	byteaGetSize(struct varlena * v);
-extern int32	byteaGetByte(struct varlena * v, int32 n);
-extern int32	byteaGetBit(struct varlena * v, int32 n);
+extern char *textout(struct varlena * vlena);
+extern text *textcat(text * t1, text * t2);
+extern bool texteq(struct varlena * arg1, struct varlena * arg2);
+extern bool textne(struct varlena * arg1, struct varlena * arg2);
+extern bool text_lt(struct varlena * arg1, struct varlena * arg2);
+extern bool text_le(struct varlena * arg1, struct varlena * arg2);
+extern bool text_gt(struct varlena * arg1, struct varlena * arg2);
+extern bool text_ge(struct varlena * arg1, struct varlena * arg2);
+extern int32 textpos(text * t1, text * t2);
+extern int32 byteaGetSize(struct varlena * v);
+extern int32 byteaGetByte(struct varlena * v, int32 n);
+extern int32 byteaGetBit(struct varlena * v, int32 n);
 extern struct varlena *byteaSetByte(struct varlena * v, int32 n, int32 newByte);
 extern struct varlena *byteaSetBit(struct varlena * v, int32 n, int32 newBit);
 
 /* datetime.c */
-extern DateADT	date_in(char *datestr);
-extern char    *date_out(DateADT dateVal);
-extern bool		date_eq(DateADT dateVal1, DateADT dateVal2);
-extern bool		date_ne(DateADT dateVal1, DateADT dateVal2);
-extern bool		date_lt(DateADT dateVal1, DateADT dateVal2);
-extern bool		date_le(DateADT dateVal1, DateADT dateVal2);
-extern bool		date_gt(DateADT dateVal1, DateADT dateVal2);
-extern bool		date_ge(DateADT dateVal1, DateADT dateVal2);
-extern int		date_cmp(DateADT dateVal1, DateADT dateVal2);
-extern DateADT	date_larger(DateADT dateVal1, DateADT dateVal2);
-extern DateADT	date_smaller(DateADT dateVal1, DateADT dateVal2);
-extern int32	date_mi(DateADT dateVal1, DateADT dateVal2);
-extern DateADT	date_pli(DateADT dateVal, int32 days);
-extern DateADT	date_mii(DateADT dateVal, int32 days);
+extern DateADT date_in(char *datestr);
+extern char *date_out(DateADT dateVal);
+extern bool date_eq(DateADT dateVal1, DateADT dateVal2);
+extern bool date_ne(DateADT dateVal1, DateADT dateVal2);
+extern bool date_lt(DateADT dateVal1, DateADT dateVal2);
+extern bool date_le(DateADT dateVal1, DateADT dateVal2);
+extern bool date_gt(DateADT dateVal1, DateADT dateVal2);
+extern bool date_ge(DateADT dateVal1, DateADT dateVal2);
+extern int	date_cmp(DateADT dateVal1, DateADT dateVal2);
+extern DateADT date_larger(DateADT dateVal1, DateADT dateVal2);
+extern DateADT date_smaller(DateADT dateVal1, DateADT dateVal2);
+extern int32 date_mi(DateADT dateVal1, DateADT dateVal2);
+extern DateADT date_pli(DateADT dateVal, int32 days);
+extern DateADT date_mii(DateADT dateVal, int32 days);
 extern DateTime *date_datetime(DateADT date);
-extern DateADT	datetime_date(DateTime * datetime);
+extern DateADT datetime_date(DateTime * datetime);
 extern DateTime *datetime_datetime(DateADT date, TimeADT * time);
-extern DateADT	abstime_date(AbsoluteTime abstime);
+extern DateADT abstime_date(AbsoluteTime abstime);
 
 extern TimeADT *time_in(char *timestr);
-extern char    *time_out(TimeADT * time);
-extern bool		time_eq(TimeADT * time1, TimeADT * time2);
-extern bool		time_ne(TimeADT * time1, TimeADT * time2);
-extern bool		time_lt(TimeADT * time1, TimeADT * time2);
-extern bool		time_le(TimeADT * time1, TimeADT * time2);
-extern bool		time_gt(TimeADT * time1, TimeADT * time2);
-extern bool		time_ge(TimeADT * time1, TimeADT * time2);
-extern int		time_cmp(TimeADT * time1, TimeADT * time2);
-extern int32	int42reltime(int32 timevalue);
+extern char *time_out(TimeADT * time);
+extern bool time_eq(TimeADT * time1, TimeADT * time2);
+extern bool time_ne(TimeADT * time1, TimeADT * time2);
+extern bool time_lt(TimeADT * time1, TimeADT * time2);
+extern bool time_le(TimeADT * time1, TimeADT * time2);
+extern bool time_gt(TimeADT * time1, TimeADT * time2);
+extern bool time_ge(TimeADT * time1, TimeADT * time2);
+extern int	time_cmp(TimeADT * time1, TimeADT * time2);
+extern int32 int42reltime(int32 timevalue);
 
 /* like.c */
-extern bool		char2like(uint16 arg1, struct varlena * p);
-extern bool		char2nlike(uint16 arg1, struct varlena * p);
-extern bool		char4like(uint32 arg1, struct varlena * p);
-extern bool		char4nlike(uint32 arg1, struct varlena * p);
-extern bool		char8like(char *s, struct varlena * p);
-extern bool		char8nlike(char *s, struct varlena * p);
-extern bool		char16like(char *s, struct varlena * p);
-extern bool		char16nlike(char *s, struct varlena * p);
-extern bool		namelike(NameData * n, struct varlena * p);
-extern bool		namenlike(NameData * s, struct varlena * p);
-extern bool		textlike(struct varlena * s, struct varlena * p);
-extern bool		textnlike(struct varlena * s, struct varlena * p);
+extern bool char2like(uint16 arg1, struct varlena * p);
+extern bool char2nlike(uint16 arg1, struct varlena * p);
+extern bool char4like(uint32 arg1, struct varlena * p);
+extern bool char4nlike(uint32 arg1, struct varlena * p);
+extern bool char8like(char *s, struct varlena * p);
+extern bool char8nlike(char *s, struct varlena * p);
+extern bool char16like(char *s, struct varlena * p);
+extern bool char16nlike(char *s, struct varlena * p);
+extern bool namelike(NameData * n, struct varlena * p);
+extern bool namenlike(NameData * s, struct varlena * p);
+extern bool textlike(struct varlena * s, struct varlena * p);
+extern bool textnlike(struct varlena * s, struct varlena * p);
 
 /* oracle_compat.c */
 
-extern text    *lower(text * string);
-extern text    *upper(text * string);
-extern text    *initcap(text * string);
-extern text    *lpad(text * string1, int4 len, text * string2);
-extern text    *rpad(text * string1, int4 len, text * string2);
-extern text    *ltrim(text * string, text * set);
-extern text    *rtrim(text * string, text * set);
-extern text    *substr(text * string, int4 m, int4 n);
-extern text    *translate(text * string, char from, char to);
+extern text *lower(text * string);
+extern text *upper(text * string);
+extern text *initcap(text * string);
+extern text *lpad(text * string1, int4 len, text * string2);
+extern text *rpad(text * string1, int4 len, text * string2);
+extern text *ltrim(text * string, text * set);
+extern text *rtrim(text * string, text * set);
+extern text *substr(text * string, int4 m, int4 n);
+extern text *translate(text * string, char from, char to);
 
 /* acl.c */
 
diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h
index 2e5f82c093b..4a88219090e 100644
--- a/src/include/utils/cash.h
+++ b/src/include/utils/cash.h
@@ -13,22 +13,22 @@
 typedef signed int Cash;
 
 extern const char *cash_out(Cash * value);
-extern Cash    *cash_in(const char *str);
-
-extern bool		cash_eq(Cash * c1, Cash * c2);
-extern bool		cash_ne(Cash * c1, Cash * c2);
-extern bool		cash_lt(Cash * c1, Cash * c2);
-extern bool		cash_le(Cash * c1, Cash * c2);
-extern bool		cash_gt(Cash * c1, Cash * c2);
-extern bool		cash_ge(Cash * c1, Cash * c2);
-
-extern Cash    *cash_pl(Cash * c1, Cash * c2);
-extern Cash    *cash_mi(Cash * c1, Cash * c2);
-extern Cash    *cash_mul(Cash * c, float8 * f);
-extern Cash    *cash_div(Cash * c, float8 * f);
-
-extern Cash    *cashlarger(Cash * c1, Cash * c2);
-extern Cash    *cashsmaller(Cash * c1, Cash * c2);
+extern Cash *cash_in(const char *str);
+
+extern bool cash_eq(Cash * c1, Cash * c2);
+extern bool cash_ne(Cash * c1, Cash * c2);
+extern bool cash_lt(Cash * c1, Cash * c2);
+extern bool cash_le(Cash * c1, Cash * c2);
+extern bool cash_gt(Cash * c1, Cash * c2);
+extern bool cash_ge(Cash * c1, Cash * c2);
+
+extern Cash *cash_pl(Cash * c1, Cash * c2);
+extern Cash *cash_mi(Cash * c1, Cash * c2);
+extern Cash *cash_mul(Cash * c, float8 * f);
+extern Cash *cash_div(Cash * c, float8 * f);
+
+extern Cash *cashlarger(Cash * c1, Cash * c2);
+extern Cash *cashsmaller(Cash * c1, Cash * c2);
 
 extern const char *cash_words_out(Cash * value);
 
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 6b33ef89b11..c7dc6283445 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.6 1997/09/07 05:02:14 momjian Exp $
+ * $Id: catcache.h,v 1.7 1997/09/08 02:39:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,11 +27,11 @@
 
 typedef struct catctup
 {
-	HeapTuple		ct_tup;		/* A pointer to a tuple			*/
-	Dlelem		   *ct_node;	/* points to LRU list is the CatCTup is in
+	HeapTuple	ct_tup;			/* A pointer to a tuple			*/
+	Dlelem	   *ct_node;		/* points to LRU list is the CatCTup is in
 								 * the cache, else, points to the cache if
 								 * the CatCTup is in LRU list */
-}				CatCTup;
+}			CatCTup;
 
 /* voodoo constants */
 #define NCCBUCK 500				/* CatCache buckets */
@@ -39,24 +39,24 @@ typedef struct catctup
 
 typedef struct catcache
 {
-	Oid				relationId;
-	Oid				indexId;
-	char		   *cc_relname; /* relation name for defered open */
-	char		   *cc_indname; /* index name for defered open */
-					HeapTuple(*cc_iscanfunc) ();		/* index scanfunction */
-	TupleDesc		cc_tupdesc; /* tuple descriptor from reldesc */
-	int				id;			/* XXX could be improved -hirohama */
-	short			cc_ntup;	/* # of tuples in this cache	*/
-	short			cc_maxtup;	/* max # of tuples allowed (LRU) */
-	short			cc_nkeys;
-	short			cc_size;
-	short			cc_key[4];
-	short			cc_klen[4];
-	ScanKeyData		cc_skey[4];
+	Oid			relationId;
+	Oid			indexId;
+	char	   *cc_relname;		/* relation name for defered open */
+	char	   *cc_indname;		/* index name for defered open */
+				HeapTuple(*cc_iscanfunc) ();	/* index scanfunction */
+	TupleDesc	cc_tupdesc;		/* tuple descriptor from reldesc */
+	int			id;				/* XXX could be improved -hirohama */
+	short		cc_ntup;		/* # of tuples in this cache	*/
+	short		cc_maxtup;		/* max # of tuples allowed (LRU) */
+	short		cc_nkeys;
+	short		cc_size;
+	short		cc_key[4];
+	short		cc_klen[4];
+	ScanKeyData cc_skey[4];
 	struct catcache *cc_next;
-	Dllist		   *cc_lrulist; /* LRU list, most recent first */
-	Dllist		   *cc_cache[NCCBUCK + 1];
-}				CatCache;
+	Dllist	   *cc_lrulist;		/* LRU list, most recent first */
+	Dllist	   *cc_cache[NCCBUCK + 1];
+}			CatCache;
 
 #define InvalidCatalogCacheId	(-1)
 
@@ -66,11 +66,11 @@ extern GlobalMemory CacheCxt;
 extern void
 CatalogCacheIdInvalidate(int cacheId, Index hashIndex,
 						 ItemPointer pointer);
-extern void		ResetSystemCache(void);
+extern void ResetSystemCache(void);
 extern CatCache *
 InitSysCache(char *relname, char *indname, int id, int nkeys,
 			 int key[], HeapTuple(*iScanfuncP) ());
-extern HeapTuple
+extern		HeapTuple
 SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
 			   Datum v3, Datum v4);
 extern void
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index 79e6fb7ff57..4c0cefce8fc 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datetime.h,v 1.4 1997/09/07 05:02:16 momjian Exp $
+ * $Id: datetime.h,v 1.5 1997/09/08 02:39:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,8 @@
 
 #include "utils/dt.h"
 
-typedef int32	DateADT;
+typedef int32 DateADT;
 
-typedef float8	TimeADT;
+typedef float8 TimeADT;
 
 #endif							/* DATETIME_H */
diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h
index 5409c8ddfe3..8fcd2136568 100644
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datum.h,v 1.3 1997/09/07 05:02:17 momjian Exp $
+ * $Id: datum.h,v 1.4 1997/09/08 02:39:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,26 +38,26 @@
  * datumGetSize
  * find the "real" length of a datum
  */
-extern Size		datumGetSize(Datum value, Oid type, bool byVal, Size len);
+extern Size datumGetSize(Datum value, Oid type, bool byVal, Size len);
 
 /*---------------
  * datumCopy
  * make a copy of a datum.
  */
-extern Datum	datumCopy(Datum value, Oid type, bool byVal, Size len);
+extern Datum datumCopy(Datum value, Oid type, bool byVal, Size len);
 
 /*---------------
  * datumFree
  * free space that *might* have been palloced by "datumCopy"
  */
-extern void		datumFree(Datum value, Oid type, bool byVal, Size len);
+extern void datumFree(Datum value, Oid type, bool byVal, Size len);
 
 /*---------------
  * datumIsEqual
  * return true if thwo datums are equal, false otherwise.
  * XXX : See comments in the code for restrictions!
  */
-extern bool
+extern		bool
 datumIsEqual(Datum value1, Datum value2, Oid type,
 			 bool byVal, Size len);
 
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index b30e3a18627..8634b7f03c2 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.19 1997/09/07 05:02:19 momjian Exp $
+ * $Id: dt.h,v 1.20 1997/09/08 02:39:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,15 +28,15 @@
  *	consisting of a beginning and ending time, not a time span - tgl 97/03/20
  */
 
-typedef double	DateTime;
+typedef double DateTime;
 
 typedef struct
 {
-	double			time;		/* all time units other than months and
+	double		time;			/* all time units other than months and
 								 * years */
-	int4			month;		/* months and years, after time for
+	int4		month;			/* months and years, after time for
 								 * alignment */
-}				TimeSpan;
+}			TimeSpan;
 
 
 /* ----------------------------------------------------------------
@@ -185,13 +185,13 @@ typedef struct
 typedef struct
 {
 #if defined(aix)
-	char		   *token;
+	char	   *token;
 #else
-	char			token[TOKMAXLEN];
+	char		token[TOKMAXLEN];
 #endif							/* aix */
-	char			type;
-	char			value;		/* this may be unsigned, alas */
-}				datetkn;
+	char		type;
+	char		value;			/* this may be unsigned, alas */
+}			datetkn;
 
 #ifdef NAN
 #define DT_INVALID		(NAN)
@@ -223,7 +223,7 @@ typedef struct
 
 #define DATETIME_CURRENT(j)		{j = DT_CURRENT;}
 #if defined(linux) && defined(PPC)
-extern int		datetime_is_current(double j);
+extern int	datetime_is_current(double j);
 
 #define DATETIME_IS_CURRENT(j)	datetime_is_current(j)
 #else
@@ -232,7 +232,7 @@ extern int		datetime_is_current(double j);
 
 #define DATETIME_EPOCH(j)		{j = DT_EPOCH;}
 #if defined(linux) && defined(PPC)
-extern int		datetime_is_epoch(double j);
+extern int	datetime_is_epoch(double j);
 
 #define DATETIME_IS_EPOCH(j)	datetime_is_epoch(j)
 #else
@@ -260,38 +260,38 @@ extern int		datetime_is_epoch(double j);
  */
 
 extern DateTime *datetime_in(char *str);
-extern char    *datetime_out(DateTime * dt);
-extern bool		datetime_eq(DateTime * dt1, DateTime * dt2);
-extern bool		datetime_ne(DateTime * dt1, DateTime * dt2);
-extern bool		datetime_lt(DateTime * dt1, DateTime * dt2);
-extern bool		datetime_le(DateTime * dt1, DateTime * dt2);
-extern bool		datetime_ge(DateTime * dt1, DateTime * dt2);
-extern bool		datetime_gt(DateTime * dt1, DateTime * dt2);
-extern bool		datetime_finite(DateTime * datetime);
-extern int		datetime_cmp(DateTime * dt1, DateTime * dt2);
+extern char *datetime_out(DateTime * dt);
+extern bool datetime_eq(DateTime * dt1, DateTime * dt2);
+extern bool datetime_ne(DateTime * dt1, DateTime * dt2);
+extern bool datetime_lt(DateTime * dt1, DateTime * dt2);
+extern bool datetime_le(DateTime * dt1, DateTime * dt2);
+extern bool datetime_ge(DateTime * dt1, DateTime * dt2);
+extern bool datetime_gt(DateTime * dt1, DateTime * dt2);
+extern bool datetime_finite(DateTime * datetime);
+extern int	datetime_cmp(DateTime * dt1, DateTime * dt2);
 extern DateTime *datetime_smaller(DateTime * dt1, DateTime * dt2);
 extern DateTime *datetime_larger(DateTime * dt1, DateTime * dt2);
 
 extern TimeSpan *timespan_in(char *str);
-extern char    *timespan_out(TimeSpan * span);
-extern bool		timespan_eq(TimeSpan * span1, TimeSpan * span2);
-extern bool		timespan_ne(TimeSpan * span1, TimeSpan * span2);
-extern bool		timespan_lt(TimeSpan * span1, TimeSpan * span2);
-extern bool		timespan_le(TimeSpan * span1, TimeSpan * span2);
-extern bool		timespan_ge(TimeSpan * span1, TimeSpan * span2);
-extern bool		timespan_gt(TimeSpan * span1, TimeSpan * span2);
-extern int		timespan_cmp(TimeSpan * span1, TimeSpan * span2);
+extern char *timespan_out(TimeSpan * span);
+extern bool timespan_eq(TimeSpan * span1, TimeSpan * span2);
+extern bool timespan_ne(TimeSpan * span1, TimeSpan * span2);
+extern bool timespan_lt(TimeSpan * span1, TimeSpan * span2);
+extern bool timespan_le(TimeSpan * span1, TimeSpan * span2);
+extern bool timespan_ge(TimeSpan * span1, TimeSpan * span2);
+extern bool timespan_gt(TimeSpan * span1, TimeSpan * span2);
+extern int	timespan_cmp(TimeSpan * span1, TimeSpan * span2);
 extern TimeSpan *timespan_smaller(TimeSpan * span1, TimeSpan * span2);
 extern TimeSpan *timespan_larger(TimeSpan * span1, TimeSpan * span2);
 
-extern text    *datetime_text(DateTime * datetime);
+extern text *datetime_text(DateTime * datetime);
 extern DateTime *text_datetime(text * str);
-extern text    *timespan_text(TimeSpan * timespan);
+extern text *timespan_text(TimeSpan * timespan);
 extern DateTime *datetime_trunc(text * units, DateTime * datetime);
 extern TimeSpan *timespan_trunc(text * units, TimeSpan * timespan);
-extern float64	datetime_part(text * units, DateTime * datetime);
-extern float64	timespan_part(text * units, TimeSpan * timespan);
-extern text    *datetime_zone(text * zone, DateTime * datetime);
+extern float64 datetime_part(text * units, DateTime * datetime);
+extern float64 timespan_part(text * units, TimeSpan * timespan);
+extern text *datetime_zone(text * zone, DateTime * datetime);
 
 extern TimeSpan *timespan_um(TimeSpan * span);
 extern TimeSpan *timespan_pl(TimeSpan * span1, TimeSpan * span2);
@@ -303,14 +303,14 @@ extern DateTime *datetime_pl_span(DateTime * dt, TimeSpan * span);
 extern DateTime *datetime_mi_span(DateTime * dt, TimeSpan * span);
 extern TimeSpan *datetime_age(DateTime * dt1, DateTime * dt2);
 
-extern void		GetCurrentTime(struct tm * tm);
+extern void GetCurrentTime(struct tm * tm);
 extern DateTime SetDateTime(DateTime datetime);
-extern int		tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime * dt);
+extern int	tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime * dt);
 
-extern void		j2date(int jd, int *year, int *month, int *day);
-extern int		date2j(int year, int month, int day);
+extern void j2date(int jd, int *year, int *month, int *day);
+extern int	date2j(int year, int month, int day);
 
-extern double	time2t(const int hour, const int min, const double sec);
+extern double time2t(const int hour, const int min, const double sec);
 
 extern int
 ParseDateTime(char *timestr, char *lowstr,
@@ -327,9 +327,9 @@ extern int
 DecodeDateDelta(char *field[], int ftype[],
 				int nf, int *dtype, struct tm * tm, double *fsec);
 
-extern int		EncodeDateOnly(struct tm * tm, int style, char *str);
-extern int		EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str);
-extern int		EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str);
-extern int		EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str);
+extern int	EncodeDateOnly(struct tm * tm, int style, char *str);
+extern int	EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str);
+extern int	EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str);
+extern int	EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str);
 
 #endif							/* DT_H */
diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h
index bf04ef10739..6febd293cee 100644
--- a/src/include/utils/dynahash.h
+++ b/src/include/utils/dynahash.h
@@ -6,13 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynahash.h,v 1.3 1997/09/07 05:02:20 momjian Exp $
+ * $Id: dynahash.h,v 1.4 1997/09/08 02:39:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DYNAHASH_H
 #define DYNAHASH_H
 
-extern int		my_log2(long num);
+extern int	my_log2(long num);
 
 #endif							/* DYNAHASH_H */
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index fe8e189ff35..7c8b075a90b 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynamic_loader.h,v 1.6 1997/09/07 05:02:22 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.7 1997/09/08 02:39:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,16 +29,16 @@
 
 typedef struct df_files
 {
-	char			filename[MAXPATHLEN];		/* Full pathname of file */
-	dev_t			device;		/* Device file is on */
-	ino_t			inode;		/* Inode number of file */
-	void		   *handle;		/* a handle for pg_dl* functions */
+	char		filename[MAXPATHLEN];	/* Full pathname of file */
+	dev_t		device;			/* Device file is on */
+	ino_t		inode;			/* Inode number of file */
+	void	   *handle;			/* a handle for pg_dl* functions */
 	struct df_files *next;
-}				DynamicFileList;
+}			DynamicFileList;
 
-extern void    *pg_dlopen(char *filename);
+extern void *pg_dlopen(char *filename);
 extern func_ptr pg_dlsym(void *handle, char *funcname);
-extern void		pg_dlclose(void *handle);
-extern char    *pg_dlerror(void);
+extern void pg_dlclose(void *handle);
+extern char *pg_dlerror(void);
 
 #endif							/* DYNAMIC_LOADER_H */
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index fc9305d9a0e..8fd93be9fa5 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: elog.h,v 1.4 1997/09/07 05:02:27 momjian Exp $
+ * $Id: elog.h,v 1.5 1997/09/08 02:39:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,10 +33,10 @@
 /* uncomment the following if you want your elog's to be timestamped */
 /* #define ELOG_TIMESTAMPS */
 
-extern void		elog(int lev, const char *fmt,...);
+extern void elog(int lev, const char *fmt,...);
 
 #ifndef PG_STANDALONE
-int				DebugFileOpen(void);
+int			DebugFileOpen(void);
 
 #endif
 
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index 5c240eeaa5d..c8b791cb6f6 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: exc.h,v 1.8 1997/09/07 05:02:28 momjian Exp $
+ * $Id: exc.h,v 1.9 1997/09/08 02:39:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,8 +17,8 @@
 
 #include "config.h"
 
-extern char    *ExcFileName;
-extern Index	ExcLineNumber;
+extern char *ExcFileName;
+extern Index ExcLineNumber;
 
 /*
  * ExcMessage and Exception are now defined in c.h
@@ -32,18 +32,18 @@ typedef sigjmp_buf ExcContext;
 #endif
 
 typedef Exception *ExcId;
-typedef long	ExcDetail;
-typedef char   *ExcData;
+typedef long ExcDetail;
+typedef char *ExcData;
 
 typedef struct ExcFrame
 {
 	struct ExcFrame *link;
-	ExcContext		context;
-	ExcId			id;
-	ExcDetail		detail;
-	ExcData			data;
-	ExcMessage		message;
-}				ExcFrame;
+	ExcContext	context;
+	ExcId		id;
+	ExcDetail	detail;
+	ExcData		data;
+	ExcMessage	message;
+}			ExcFrame;
 
 extern ExcFrame *ExcCurFrameP;
 
@@ -71,13 +71,13 @@ extern ExcFrame *ExcCurFrameP;
 #define reraise() \
 		raise4(*exception.id,exception.detail,exception.data,exception.message)
 
-typedef void	ExcProc(Exception *, ExcDetail, ExcData, ExcMessage);
+typedef void ExcProc(Exception *, ExcDetail, ExcData, ExcMessage);
 
 
 /*
  * prototypes for functions in exc.c
  */
-extern void		EnableExceptionHandling(bool on);
+extern void EnableExceptionHandling(bool on);
 extern void
 ExcRaise(Exception * excP,
 		 ExcDetail detail,
diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h
index 27c3269b0e4..af8111676e4 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache.h,v 1.3 1997/09/07 05:02:30 momjian Exp $
+ * $Id: fcache.h,v 1.4 1997/09/08 02:39:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,39 +16,39 @@
 
 typedef struct
 {
-	int				typlen;		/* length of the return type */
-	int				typbyval;	/* true if return type is pass by value */
-	func_ptr		func;		/* address of function to call (for c
+	int			typlen;			/* length of the return type */
+	int			typbyval;		/* true if return type is pass by value */
+	func_ptr	func;			/* address of function to call (for c
 								 * funcs) */
-	Oid				foid;		/* oid of the function in pg_proc */
-	Oid				language;	/* oid of the language in pg_language */
-	int				nargs;		/* number of arguments */
+	Oid			foid;			/* oid of the function in pg_proc */
+	Oid			language;		/* oid of the language in pg_language */
+	int			nargs;			/* number of arguments */
 
 	/* Might want to make these two arrays of size MAXFUNCARGS */
 
-	Oid			   *argOidVect; /* oids of all the arguments */
-	bool		   *nullVect;	/* keep track of null arguments */
+	Oid		   *argOidVect;		/* oids of all the arguments */
+	bool	   *nullVect;		/* keep track of null arguments */
 
-	char		   *src;		/* source code of the function */
-	char		   *bin;		/* binary object code ?? */
-	char		   *func_state; /* fuction_state struct for execution */
+	char	   *src;			/* source code of the function */
+	char	   *bin;			/* binary object code ?? */
+	char	   *func_state;		/* fuction_state struct for execution */
 
-	bool			oneResult;	/* true we only want 1 result from the
+	bool		oneResult;		/* true we only want 1 result from the
 								 * function */
-	bool			hasSetArg;	/* true if func is part of a nested dot
+	bool		hasSetArg;		/* true if func is part of a nested dot
 								 * expr whose argument is func returning a
 								 * set ugh! */
 
-	Pointer			funcSlot;	/* if one result we need to copy it before
+	Pointer		funcSlot;		/* if one result we need to copy it before
 								 * we end execution of the function and
 								 * free stuff */
 
-	char		   *setArg;		/* current argument for nested dot
+	char	   *setArg;			/* current argument for nested dot
 								 * execution Nested dot expressions mean
 								 * we have funcs whose argument is a set
 								 * of tuples */
 
-	bool			istrusted;	/* trusted fn? */
-}				FunctionCache, *FunctionCachePtr;
+	bool		istrusted;		/* trusted fn? */
+}			FunctionCache, *FunctionCachePtr;
 
 #endif							/* FCACHE_H */
diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h
index 781ff241393..bf9c7fb0c64 100644
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache2.h,v 1.3 1997/09/07 05:02:31 momjian Exp $
+ * $Id: fcache2.h,v 1.4 1997/09/08 02:39:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,6 @@
 #include <nodes/execnodes.h>
 
 extern void
-				setFcache(Node * node, Oid foid, List * argList, ExprContext * econtext);
+			setFcache(Node * node, Oid foid, List * argList, ExprContext * econtext);
 
 #endif							/* FCACHE2_H */
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index e23f7c79266..a94e7f4811c 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fmgrtab.h,v 1.5 1997/09/07 05:02:32 momjian Exp $
+ * $Id: fmgrtab.h,v 1.6 1997/09/08 02:39:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,14 +16,14 @@
 
 typedef struct
 {
-	Oid				proid;
-	uint16			nargs;
-	func_ptr		func;
-	char		   *funcName;
-}				FmgrCall;
+	Oid			proid;
+	uint16		nargs;
+	func_ptr	func;
+	char	   *funcName;
+}			FmgrCall;
 
 extern FmgrCall *fmgr_isbuiltin(Oid id);
 extern func_ptr fmgr_lookupByName(char *name);
-extern void		load_file(char *filename);
+extern void load_file(char *filename);
 
 #endif							/* FMGRTAB_H */
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index 4cbbeca3b82..55b57742183 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.9 1997/09/07 05:02:34 momjian Exp $
+ * $Id: geo_decls.h,v 1.10 1997/09/08 02:39:46 momjian Exp $
  *
  * NOTE
  *	  These routines do *not* use the float types from adt/.
@@ -65,9 +65,9 @@
  *-------------------------------------------------------------------*/
 typedef struct
 {
-	double			x,
-					y;
-}				Point;
+	double		x,
+				y;
+}			Point;
 
 
 /*---------------------------------------------------------------------
@@ -75,10 +75,10 @@ typedef struct
  *-------------------------------------------------------------------*/
 typedef struct
 {
-	Point			p[2];
+	Point		p[2];
 
-	double			m;			/* precomputed to save time, not in tuple */
-}				LSEG;
+	double		m;				/* precomputed to save time, not in tuple */
+}			LSEG;
 
 
 /*---------------------------------------------------------------------
@@ -86,12 +86,12 @@ typedef struct
  *-------------------------------------------------------------------*/
 typedef struct
 {
-	int32			size;		/* XXX varlena */
-	int32			npts;
-	int32			closed;		/* is this a closed polygon? */
-	int32			dummy;		/* padding to make it double align */
-	Point			p[1];		/* variable length array of POINTs */
-}				PATH;
+	int32		size;			/* XXX varlena */
+	int32		npts;
+	int32		closed;			/* is this a closed polygon? */
+	int32		dummy;			/* padding to make it double align */
+	Point		p[1];			/* variable length array of POINTs */
+}			PATH;
 
 
 /*---------------------------------------------------------------------
@@ -104,12 +104,12 @@ typedef struct
  *-------------------------------------------------------------------*/
 typedef struct
 {
-	double			A,
-					B,
-					C;
+	double		A,
+				B,
+				C;
 
-	double			m;
-}				LINE;
+	double		m;
+}			LINE;
 
 
 /*---------------------------------------------------------------------
@@ -118,9 +118,9 @@ typedef struct
  *-------------------------------------------------------------------*/
 typedef struct
 {
-	Point			high,
-					low;		/* corner POINTs */
-}				BOX;
+	Point		high,
+				low;			/* corner POINTs */
+}			BOX;
 
 /*---------------------------------------------------------------------
  * POLYGON - Specified by an array of doubles defining the points,
@@ -129,178 +129,178 @@ typedef struct
  *-------------------------------------------------------------------*/
 typedef struct
 {
-	int32			size;		/* XXX varlena */
-	int32			npts;
-	BOX				boundbox;
-	Point			p[1];		/* variable length array of POINTs */
-}				POLYGON;
+	int32		size;			/* XXX varlena */
+	int32		npts;
+	BOX			boundbox;
+	Point		p[1];			/* variable length array of POINTs */
+}			POLYGON;
 
 /*---------------------------------------------------------------------
  * CIRCLE - Specified by a center point and radius.
  *-------------------------------------------------------------------*/
 typedef struct
 {
-	Point			center;
-	double			radius;
-}				CIRCLE;
+	Point		center;
+	double		radius;
+}			CIRCLE;
 
 /*
  * in geo_ops.h
  */
 
 /* public point routines */
-extern Point   *point_in(char *str);
-extern char    *point_out(Point * pt);
-extern bool		point_left(Point * pt1, Point * pt2);
-extern bool		point_right(Point * pt1, Point * pt2);
-extern bool		point_above(Point * pt1, Point * pt2);
-extern bool		point_below(Point * pt1, Point * pt2);
-extern bool		point_vert(Point * pt1, Point * pt2);
-extern bool		point_horiz(Point * pt1, Point * pt2);
-extern bool		point_eq(Point * pt1, Point * pt2);
-extern int32	pointdist(Point * p1, Point * p2);
-extern double  *point_distance(Point * pt1, Point * pt2);
-extern double  *point_slope(Point * pt1, Point * pt2);
+extern Point *point_in(char *str);
+extern char *point_out(Point * pt);
+extern bool point_left(Point * pt1, Point * pt2);
+extern bool point_right(Point * pt1, Point * pt2);
+extern bool point_above(Point * pt1, Point * pt2);
+extern bool point_below(Point * pt1, Point * pt2);
+extern bool point_vert(Point * pt1, Point * pt2);
+extern bool point_horiz(Point * pt1, Point * pt2);
+extern bool point_eq(Point * pt1, Point * pt2);
+extern int32 pointdist(Point * p1, Point * p2);
+extern double *point_distance(Point * pt1, Point * pt2);
+extern double *point_slope(Point * pt1, Point * pt2);
 
 /* private routines */
-extern double	point_dt(Point * pt1, Point * pt2);
-extern double	point_sl(Point * pt1, Point * pt2);
+extern double point_dt(Point * pt1, Point * pt2);
+extern double point_sl(Point * pt1, Point * pt2);
 
-extern Point   *point(float8 * x, float8 * y);
-extern Point   *point_add(Point * p1, Point * p2);
-extern Point   *point_sub(Point * p1, Point * p2);
-extern Point   *point_mul(Point * p1, Point * p2);
-extern Point   *point_div(Point * p1, Point * p2);
+extern Point *point(float8 * x, float8 * y);
+extern Point *point_add(Point * p1, Point * p2);
+extern Point *point_sub(Point * p1, Point * p2);
+extern Point *point_mul(Point * p1, Point * p2);
+extern Point *point_div(Point * p1, Point * p2);
 
 /* public lseg routines */
-extern LSEG    *lseg_in(char *str);
-extern char    *lseg_out(LSEG * ls);
-extern bool		lseg_intersect(LSEG * l1, LSEG * l2);
-extern bool		lseg_parallel(LSEG * l1, LSEG * l2);
-extern bool		lseg_perp(LSEG * l1, LSEG * l2);
-extern bool		lseg_vertical(LSEG * lseg);
-extern bool		lseg_horizontal(LSEG * lseg);
-extern bool		lseg_eq(LSEG * l1, LSEG * l2);
-extern double  *lseg_distance(LSEG * l1, LSEG * l2);
-extern Point   *lseg_center(LSEG * lseg);
-extern Point   *lseg_interpt(LSEG * l1, LSEG * l2);
-extern double  *dist_pl(Point * pt, LINE * line);
-extern double  *dist_ps(Point * pt, LSEG * lseg);
-extern double  *dist_ppath(Point * pt, PATH * path);
-extern double  *dist_pb(Point * pt, BOX * box);
-extern double  *dist_sl(LSEG * lseg, LINE * line);
-extern double  *dist_sb(LSEG * lseg, BOX * box);
-extern double  *dist_lb(LINE * line, BOX * box);
-extern Point   *close_pl(Point * pt, LINE * line);
-extern Point   *close_ps(Point * pt, LSEG * lseg);
-extern Point   *close_pb(Point * pt, BOX * box);
-extern Point   *close_sl(LSEG * lseg, LINE * line);
-extern Point   *close_sb(LSEG * lseg, BOX * box);
-extern Point   *close_lb(LINE * line, BOX * box);
-extern bool		on_pl(Point * pt, LINE * line);
-extern bool		on_ps(Point * pt, LSEG * lseg);
-extern bool		on_pb(Point * pt, BOX * box);
-extern bool		on_ppath(Point * pt, PATH * path);
-extern bool		on_sl(LSEG * lseg, LINE * line);
-extern bool		on_sb(LSEG * lseg, BOX * box);
-extern bool		inter_sl(LSEG * lseg, LINE * line);
-extern bool		inter_sb(LSEG * lseg, BOX * box);
-extern bool		inter_lb(LINE * line, BOX * box);
+extern LSEG *lseg_in(char *str);
+extern char *lseg_out(LSEG * ls);
+extern bool lseg_intersect(LSEG * l1, LSEG * l2);
+extern bool lseg_parallel(LSEG * l1, LSEG * l2);
+extern bool lseg_perp(LSEG * l1, LSEG * l2);
+extern bool lseg_vertical(LSEG * lseg);
+extern bool lseg_horizontal(LSEG * lseg);
+extern bool lseg_eq(LSEG * l1, LSEG * l2);
+extern double *lseg_distance(LSEG * l1, LSEG * l2);
+extern Point *lseg_center(LSEG * lseg);
+extern Point *lseg_interpt(LSEG * l1, LSEG * l2);
+extern double *dist_pl(Point * pt, LINE * line);
+extern double *dist_ps(Point * pt, LSEG * lseg);
+extern double *dist_ppath(Point * pt, PATH * path);
+extern double *dist_pb(Point * pt, BOX * box);
+extern double *dist_sl(LSEG * lseg, LINE * line);
+extern double *dist_sb(LSEG * lseg, BOX * box);
+extern double *dist_lb(LINE * line, BOX * box);
+extern Point *close_pl(Point * pt, LINE * line);
+extern Point *close_ps(Point * pt, LSEG * lseg);
+extern Point *close_pb(Point * pt, BOX * box);
+extern Point *close_sl(LSEG * lseg, LINE * line);
+extern Point *close_sb(LSEG * lseg, BOX * box);
+extern Point *close_lb(LINE * line, BOX * box);
+extern bool on_pl(Point * pt, LINE * line);
+extern bool on_ps(Point * pt, LSEG * lseg);
+extern bool on_pb(Point * pt, BOX * box);
+extern bool on_ppath(Point * pt, PATH * path);
+extern bool on_sl(LSEG * lseg, LINE * line);
+extern bool on_sb(LSEG * lseg, BOX * box);
+extern bool inter_sl(LSEG * lseg, LINE * line);
+extern bool inter_sb(LSEG * lseg, BOX * box);
+extern bool inter_lb(LINE * line, BOX * box);
 
 /* private routines */
-extern LSEG    *lseg_construct(Point * pt1, Point * pt2);
+extern LSEG *lseg_construct(Point * pt1, Point * pt2);
 
 /* public box routines */
-extern BOX	   *box_in(char *str);
-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 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);
 
 /* 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(Point * p1, Point * p2);
+extern BOX *box_add(BOX * box, Point * p);
+extern BOX *box_sub(BOX * box, Point * p);
+extern BOX *box_mul(BOX * box, Point * p);
+extern BOX *box_div(BOX * box, Point * p);
 
 /* private line routines */
-extern double  *line_distance(LINE * l1, LINE * l2);
+extern double *line_distance(LINE * l1, LINE * l2);
 
 /* public path routines */
-extern PATH    *path_in(char *str);
-extern char    *path_out(PATH * path);
-extern bool		path_n_lt(PATH * p1, PATH * p2);
-extern bool		path_n_gt(PATH * p1, PATH * p2);
-extern bool		path_n_eq(PATH * p1, PATH * p2);
-extern bool		path_n_le(PATH * p1, PATH * p2);
-extern bool		path_n_ge(PATH * p1, PATH * p2);
-extern bool		path_inter(PATH * p1, PATH * p2);
-extern double  *path_distance(PATH * p1, PATH * p2);
-extern double  *path_length(PATH * path);
-
-extern bool		path_isclosed(PATH * path);
-extern bool		path_isopen(PATH * path);
-extern int4		path_npoints(PATH * path);
-
-extern PATH    *path_close(PATH * path);
-extern PATH    *path_open(PATH * path);
-extern PATH    *path_add(PATH * p1, PATH * p2);
-extern PATH    *path_add_pt(PATH * path, Point * point);
-extern PATH    *path_sub_pt(PATH * path, Point * point);
-extern PATH    *path_mul_pt(PATH * path, Point * point);
-extern PATH    *path_div_pt(PATH * path, Point * point);
-extern bool		path_contain_pt(PATH * path, Point * p);
-extern bool		pt_contained_path(Point * p, PATH * path);
-
-extern Point   *path_center(PATH * path);
+extern PATH *path_in(char *str);
+extern char *path_out(PATH * path);
+extern bool path_n_lt(PATH * p1, PATH * p2);
+extern bool path_n_gt(PATH * p1, PATH * p2);
+extern bool path_n_eq(PATH * p1, PATH * p2);
+extern bool path_n_le(PATH * p1, PATH * p2);
+extern bool path_n_ge(PATH * p1, PATH * p2);
+extern bool path_inter(PATH * p1, PATH * p2);
+extern double *path_distance(PATH * p1, PATH * p2);
+extern double *path_length(PATH * path);
+
+extern bool path_isclosed(PATH * path);
+extern bool path_isopen(PATH * path);
+extern int4 path_npoints(PATH * path);
+
+extern PATH *path_close(PATH * path);
+extern PATH *path_open(PATH * path);
+extern PATH *path_add(PATH * p1, PATH * p2);
+extern PATH *path_add_pt(PATH * path, Point * point);
+extern PATH *path_sub_pt(PATH * path, Point * point);
+extern PATH *path_mul_pt(PATH * path, Point * point);
+extern PATH *path_div_pt(PATH * path, Point * point);
+extern bool path_contain_pt(PATH * path, Point * p);
+extern bool pt_contained_path(Point * p, PATH * path);
+
+extern Point *path_center(PATH * path);
 extern POLYGON *path_poly(PATH * path);
 
-extern PATH    *upgradepath(PATH * path);
-extern bool		isoldpath(PATH * path);
+extern PATH *upgradepath(PATH * path);
+extern bool isoldpath(PATH * path);
 
 /* public polygon routines */
 extern POLYGON *poly_in(char *s);
-extern char    *poly_out(POLYGON * poly);
-extern bool		poly_left(POLYGON * polya, POLYGON * polyb);
-extern bool		poly_overleft(POLYGON * polya, POLYGON * polyb);
-extern bool		poly_right(POLYGON * polya, POLYGON * polyb);
-extern bool		poly_overright(POLYGON * polya, POLYGON * polyb);
-extern bool		poly_same(POLYGON * polya, POLYGON * polyb);
-extern bool		poly_overlap(POLYGON * polya, POLYGON * polyb);
-extern bool		poly_contain(POLYGON * polya, POLYGON * polyb);
-extern bool		poly_contained(POLYGON * polya, POLYGON * polyb);
-extern bool		poly_contain_pt(POLYGON * poly, Point * p);
-extern bool		pt_contained_poly(Point * p, POLYGON * poly);
-
-extern double  *poly_distance(POLYGON * polya, POLYGON * polyb);
-extern int4		poly_npoints(POLYGON * poly);
-extern Point   *poly_center(POLYGON * poly);
-extern BOX	   *poly_box(POLYGON * poly);
-extern PATH    *poly_path(POLYGON * poly);
+extern char *poly_out(POLYGON * poly);
+extern bool poly_left(POLYGON * polya, POLYGON * polyb);
+extern bool poly_overleft(POLYGON * polya, POLYGON * polyb);
+extern bool poly_right(POLYGON * polya, POLYGON * polyb);
+extern bool poly_overright(POLYGON * polya, POLYGON * polyb);
+extern bool poly_same(POLYGON * polya, POLYGON * polyb);
+extern bool poly_overlap(POLYGON * polya, POLYGON * polyb);
+extern bool poly_contain(POLYGON * polya, POLYGON * polyb);
+extern bool poly_contained(POLYGON * polya, POLYGON * polyb);
+extern bool poly_contain_pt(POLYGON * poly, Point * p);
+extern bool pt_contained_poly(Point * p, POLYGON * poly);
+
+extern double *poly_distance(POLYGON * polya, POLYGON * polyb);
+extern int4 poly_npoints(POLYGON * poly);
+extern Point *poly_center(POLYGON * poly);
+extern BOX *poly_box(POLYGON * poly);
+extern PATH *poly_path(POLYGON * poly);
 extern POLYGON *box_poly(BOX * box);
 
 extern POLYGON *upgradepoly(POLYGON * poly);
@@ -309,52 +309,52 @@ extern POLYGON *revertpoly(POLYGON * poly);
 /* private polygon routines */
 
 /* public circle routines */
-extern CIRCLE  *circle_in(char *str);
-extern char    *circle_out(CIRCLE * circle);
-extern bool		circle_same(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_overlap(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_overleft(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_left(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_right(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_overright(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_contained(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_contain(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_below(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_above(CIRCLE * circle1, CIRCLE * circle2);
-
-extern bool		circle_eq(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_ne(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_lt(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_gt(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_le(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_ge(CIRCLE * circle1, CIRCLE * circle2);
-extern bool		circle_contain_pt(CIRCLE * circle, Point * point);
-extern bool		pt_contained_circle(Point * point, CIRCLE * circle);
-extern CIRCLE  *circle_add_pt(CIRCLE * circle, Point * point);
-extern CIRCLE  *circle_sub_pt(CIRCLE * circle, Point * point);
-extern CIRCLE  *circle_mul_pt(CIRCLE * circle, Point * point);
-extern CIRCLE  *circle_div_pt(CIRCLE * circle, Point * point);
-extern double  *circle_diameter(CIRCLE * circle);
-extern double  *circle_radius(CIRCLE * circle);
-extern double  *circle_distance(CIRCLE * circle1, CIRCLE * circle2);
-extern double  *dist_pc(Point * point, CIRCLE * circle);
-extern double  *dist_cpoly(CIRCLE * circle, POLYGON * poly);
-extern Point   *circle_center(CIRCLE * circle);
-extern CIRCLE  *circle(Point * center, float8 * radius);
-extern CIRCLE  *box_circle(BOX * box);
-extern BOX	   *circle_box(CIRCLE * circle);
-extern CIRCLE  *poly_circle(POLYGON * poly);
+extern CIRCLE *circle_in(char *str);
+extern char *circle_out(CIRCLE * circle);
+extern bool circle_same(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_overlap(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_overleft(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_left(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_right(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_overright(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_contained(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_contain(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_below(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_above(CIRCLE * circle1, CIRCLE * circle2);
+
+extern bool circle_eq(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_ne(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_lt(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_gt(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_le(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_ge(CIRCLE * circle1, CIRCLE * circle2);
+extern bool circle_contain_pt(CIRCLE * circle, Point * point);
+extern bool pt_contained_circle(Point * point, CIRCLE * circle);
+extern CIRCLE *circle_add_pt(CIRCLE * circle, Point * point);
+extern CIRCLE *circle_sub_pt(CIRCLE * circle, Point * point);
+extern CIRCLE *circle_mul_pt(CIRCLE * circle, Point * point);
+extern CIRCLE *circle_div_pt(CIRCLE * circle, Point * point);
+extern double *circle_diameter(CIRCLE * circle);
+extern double *circle_radius(CIRCLE * circle);
+extern double *circle_distance(CIRCLE * circle1, CIRCLE * circle2);
+extern double *dist_pc(Point * point, CIRCLE * circle);
+extern double *dist_cpoly(CIRCLE * circle, POLYGON * poly);
+extern Point *circle_center(CIRCLE * circle);
+extern CIRCLE *circle(Point * center, float8 * radius);
+extern 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);
 
 /* private routines */
-extern double  *circle_area(CIRCLE * circle);
-extern double	circle_dt(CIRCLE * circle1, CIRCLE * circle2);
+extern double *circle_area(CIRCLE * circle);
+extern double circle_dt(CIRCLE * circle1, CIRCLE * circle2);
 
 /* geo_selfuncs.c */
-extern float64
+extern		float64
 areasel(Oid opid, Oid relid, AttrNumber attno,
 		char *value, int32 flag);
-extern float64
+extern		float64
 areajoinsel(Oid opid, Oid relid, AttrNumber attno,
 			char *value, int32 flag);
 
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index 577e6edfcdc..7cc6894c92a 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hsearch.h,v 1.4 1997/09/07 05:02:35 momjian Exp $
+ * $Id: hsearch.h,v 1.5 1997/09/08 02:39:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,9 +34,9 @@
  */
 typedef struct element
 {
-	unsigned long	next;		/* secret from user		 */
-	long			key;
-}				ELEMENT;
+	unsigned long next;			/* secret from user		 */
+	long		key;
+}			ELEMENT;
 
 typedef unsigned long BUCKET_INDEX;
 
@@ -46,58 +46,58 @@ typedef unsigned long SEG_OFFSET;
 
 typedef struct hashhdr
 {
-	long			bsize;		/* Bucket/Page Size */
-	long			bshift;		/* Bucket shift */
-	long			dsize;		/* Directory Size */
-	long			ssize;		/* Segment Size */
-	long			sshift;		/* Segment shift */
-	long			max_bucket; /* ID of Maximum bucket in use */
-	long			high_mask;	/* Mask to modulo into entire table */
-	long			low_mask;	/* Mask to modulo into lower half of table */
-	long			ffactor;	/* Fill factor */
-	long			nkeys;		/* Number of keys in hash table */
-	long			nsegs;		/* Number of allocated segments */
-	long			keysize;	/* hash key length in bytes */
-	long			datasize;	/* elem data length in bytes */
-	long			max_dsize;	/* 'dsize' limit if directory is fixed
+	long		bsize;			/* Bucket/Page Size */
+	long		bshift;			/* Bucket shift */
+	long		dsize;			/* Directory Size */
+	long		ssize;			/* Segment Size */
+	long		sshift;			/* Segment shift */
+	long		max_bucket;		/* ID of Maximum bucket in use */
+	long		high_mask;		/* Mask to modulo into entire table */
+	long		low_mask;		/* Mask to modulo into lower half of table */
+	long		ffactor;		/* Fill factor */
+	long		nkeys;			/* Number of keys in hash table */
+	long		nsegs;			/* Number of allocated segments */
+	long		keysize;		/* hash key length in bytes */
+	long		datasize;		/* elem data length in bytes */
+	long		max_dsize;		/* 'dsize' limit if directory is fixed
 								 * size */
-	BUCKET_INDEX	freeBucketIndex;
+	BUCKET_INDEX freeBucketIndex;
 	/* index of first free bucket */
 #ifdef HASH_STATISTICS
-	long			accesses;
-	long			collisions;
+	long		accesses;
+	long		collisions;
 #endif
-}				HHDR;
+}			HHDR;
 
 typedef struct htab
 {
-	HHDR		   *hctl;		/* shared control information */
-	long			(*hash) (); /* Hash Function */
-	char		   *segbase;	/* segment base address for calculating
+	HHDR	   *hctl;			/* shared control information */
+	long		(*hash) ();		/* Hash Function */
+	char	   *segbase;		/* segment base address for calculating
 								 * pointer values */
-	SEG_OFFSET	   *dir;		/* 'directory' of segm starts */
-	long		   *(*alloc) ();/* memory allocator (long * for alignment
+	SEG_OFFSET *dir;			/* 'directory' of segm starts */
+	long	   *(*alloc) ();	/* memory allocator (long * for alignment
 								 * reasons) */
 
-}				HTAB;
+}			HTAB;
 
 typedef struct hashctl
 {
-	long			bsize;		/* Bucket Size */
-	long			ssize;		/* Segment Size */
-	long			dsize;		/* Dirsize Size */
-	long			ffactor;	/* Fill factor */
-	long			(*hash) (); /* Hash Function */
-	long			keysize;	/* hash key length in bytes */
-	long			datasize;	/* elem data length in bytes */
-	long			max_size;	/* limit to dsize if directory size is
+	long		bsize;			/* Bucket Size */
+	long		ssize;			/* Segment Size */
+	long		dsize;			/* Dirsize Size */
+	long		ffactor;		/* Fill factor */
+	long		(*hash) ();		/* Hash Function */
+	long		keysize;		/* hash key length in bytes */
+	long		datasize;		/* elem data length in bytes */
+	long		max_size;		/* limit to dsize if directory size is
 								 * limited */
-	long		   *segbase;	/* base for calculating bucket + seg ptrs */
-	long		   *(*alloc) ();/* memory allocation function */
-	long		   *dir;		/* directory if allocated already */
-	long		   *hctl;		/* location of header information in shd
+	long	   *segbase;		/* base for calculating bucket + seg ptrs */
+	long	   *(*alloc) ();	/* memory allocation function */
+	long	   *dir;			/* directory if allocated already */
+	long	   *hctl;			/* location of header information in shd
 								 * mem */
-}				HASHCTL;
+}			HASHCTL;
 
 /* Flags to indicate action for hctl */
 #define HASH_BUCKET		0x001	/* Setting bucket size */
@@ -125,23 +125,23 @@ typedef enum
 	HASH_REMOVE,
 	HASH_FIND_SAVE,
 	HASH_REMOVE_SAVED
-}				HASHACTION;
+}			HASHACTION;
 
 /*
  * prototypes from functions in dynahash.c
  */
-extern HTAB    *hash_create(int nelem, HASHCTL * info, int flags);
-extern void		hash_destroy(HTAB * hashp);
-extern void		hash_stats(char *where, HTAB * hashp);
-extern long    *
+extern HTAB *hash_create(int nelem, HASHCTL * info, int flags);
+extern void hash_destroy(HTAB * hashp);
+extern void hash_stats(char *where, HTAB * hashp);
+extern long *
 hash_search(HTAB * hashp, char *keyPtr, HASHACTION action,
 			bool * foundPtr);
-extern long    *hash_seq(HTAB * hashp);
+extern long *hash_seq(HTAB * hashp);
 
 /*
  * prototypes from functions in hashfn.c
  */
-extern long		string_hash(char *key, int keysize);
-extern long		tag_hash(int *key, int keysize);
+extern long string_hash(char *key, int keysize);
+extern long tag_hash(int *key, int keysize);
 
 #endif							/* HSEARCH_H */
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 21ea8eefb6b..ada1cf32d12 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.5 1997/09/07 05:02:36 momjian Exp $
+ * $Id: inval.h,v 1.6 1997/09/08 02:39:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,13 +16,13 @@
 #include <access/htup.h>
 #include <utils/rel.h>
 
-extern void		DiscardInvalid(void);
+extern void DiscardInvalid(void);
 
-extern void		RegisterInvalid(bool send);
+extern void RegisterInvalid(bool send);
 
-extern void		SetRefreshWhenInvalidate(bool on);
+extern void SetRefreshWhenInvalidate(bool on);
 
-extern void		RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple);
+extern void RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple);
 
 /*
  * POSTGRES local cache invalidation definitions. (originates from linval.h)
@@ -30,13 +30,13 @@ extern void		RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple);
 typedef struct InvalidationUserData
 {
 	struct InvalidationUserData *dataP[1];		/* VARIABLE LENGTH */
-}				InvalidationUserData;	/* VARIABLE LENGTH STRUCTURE */
+}			InvalidationUserData;		/* VARIABLE LENGTH STRUCTURE */
 
 typedef struct InvalidationEntryData
 {
 	InvalidationUserData *nextP;
 	InvalidationUserData userData;		/* VARIABLE LENGTH ARRAY */
-}				InvalidationEntryData;	/* VARIABLE LENGTH STRUCTURE */
+}			InvalidationEntryData;		/* VARIABLE LENGTH STRUCTURE */
 
 typedef Pointer InvalidationEntry;
 
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index d5498df779a..f31fa5583d2 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.5 1997/09/07 05:02:38 momjian Exp $
+ * $Id: lselect.h,v 1.6 1997/09/08 02:39:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,9 +18,9 @@
 
 struct leftist
 {
-	short			lt_dist;	/* distance to leaf/empty node */
-	short			lt_devnum;	/* device number of tuple */
-	HeapTuple		lt_tuple;
+	short		lt_dist;		/* distance to leaf/empty node */
+	short		lt_devnum;		/* device number of tuple */
+	HeapTuple	lt_tuple;
 	struct leftist *lt_left;
 	struct leftist *lt_right;
 };
@@ -28,27 +28,27 @@ struct leftist
 /* replaces global variables in lselect.c to make it reentrant */
 typedef struct
 {
-	TupleDesc		tupDesc;
-	int				nKeys;
-	ScanKey			scanKeys;
-	int				sortMem;	/* needed for psort */
-}				LeftistContextData;
+	TupleDesc	tupDesc;
+	int			nKeys;
+	ScanKey		scanKeys;
+	int			sortMem;		/* needed for psort */
+}			LeftistContextData;
 typedef LeftistContextData *LeftistContext;
 
 extern struct leftist *
 lmerge(struct leftist * pt, struct leftist * qt,
 	   LeftistContext context);
-extern HeapTuple
+extern		HeapTuple
 gettuple(struct leftist ** treep, short *devnum,
 		 LeftistContext context);
 extern void
 puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum,
 		 LeftistContext context);
-extern int		tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context);
+extern int	tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context);
 
 #ifdef EBUG
-extern void		checktree(struct leftist * tree, LeftistContext context);
-extern int		checktreer(struct leftist * tree, int level, LeftistContext context);
+extern void checktree(struct leftist * tree, LeftistContext context);
+extern int	checktreer(struct leftist * tree, int level, LeftistContext context);
 
 #endif							/* EBUG */
 
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 5abc26912cd..cad6ecfbfa4 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.4 1997/09/07 05:02:39 momjian Exp $
+ * $Id: lsyscache.h,v 1.5 1997/09/08 02:39:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,29 +16,29 @@
 #include <access/attnum.h>
 #include <access/htup.h>
 
-extern bool		op_class(Oid opid, int32 opclass, Oid amopid);
-extern char    *get_attname(Oid relid, AttrNumber attnum);
+extern bool op_class(Oid opid, int32 opclass, Oid amopid);
+extern char *get_attname(Oid relid, AttrNumber attnum);
 extern AttrNumber get_attnum(Oid relid, char *attname);
-extern Oid		get_atttype(Oid relid, AttrNumber attnum);
-extern bool		get_attisset(Oid relid, char *attname);
+extern Oid	get_atttype(Oid relid, AttrNumber attnum);
+extern bool get_attisset(Oid relid, char *attname);
 extern RegProcedure get_opcode(Oid opid);
-extern char    *get_opname(Oid opid);
-extern bool
+extern char *get_opname(Oid opid);
+extern		bool
 op_mergesortable(Oid opid, Oid ltype, Oid rtype,
 				 Oid * leftOp, Oid * rightOp);
-extern Oid		op_hashjoinable(Oid opid, Oid ltype, Oid rtype);
-extern Oid		get_commutator(Oid opid);
+extern Oid	op_hashjoinable(Oid opid, Oid ltype, Oid rtype);
+extern Oid	get_commutator(Oid opid);
 extern HeapTuple get_operator_tuple(Oid opno);
-extern Oid		get_negator(Oid opid);
+extern Oid	get_negator(Oid opid);
 extern RegProcedure get_oprrest(Oid opid);
 extern RegProcedure get_oprjoin(Oid opid);
-extern int		get_relnatts(Oid relid);
-extern char    *get_rel_name(Oid relid);
+extern int	get_relnatts(Oid relid);
+extern char *get_rel_name(Oid relid);
 extern struct varlena *get_relstub(Oid relid, int no, bool * islast);
-extern Oid		get_ruleid(char *rulename);
-extern Oid		get_eventrelid(Oid ruleid);
-extern int16	get_typlen(Oid typid);
-extern bool		get_typbyval(Oid typid);
+extern Oid	get_ruleid(char *rulename);
+extern Oid	get_eventrelid(Oid ruleid);
+extern int16 get_typlen(Oid typid);
+extern bool get_typbyval(Oid typid);
 extern struct varlena *get_typdefault(Oid typid);
 
 #endif							/* LSYSCACHE_H */
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index b7dfcc7cda6..4c37d33187c 100644
--- a/src/include/utils/mcxt.h
+++ b/src/include/utils/mcxt.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: mcxt.h,v 1.6 1997/09/07 05:02:40 momjian Exp $
+ * $Id: mcxt.h,v 1.7 1997/09/08 02:39:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,16 +37,16 @@ extern MemoryContext TopMemoryContext;
 /*
  * prototypes for functions in mcxt.c
  */
-extern void		EnableMemoryContext(bool on);
-extern Pointer	MemoryContextAlloc(MemoryContext context, Size size);
-extern Pointer
+extern void EnableMemoryContext(bool on);
+extern Pointer MemoryContextAlloc(MemoryContext context, Size size);
+extern		Pointer
 MemoryContextRealloc(MemoryContext context,
 					 Pointer pointer,
 					 Size size);
-extern void		MemoryContextFree(MemoryContext context, Pointer pointer);
+extern void MemoryContextFree(MemoryContext context, Pointer pointer);
 extern MemoryContext MemoryContextSwitchTo(MemoryContext context);
 extern GlobalMemory CreateGlobalMemory(char *name);
-extern void		GlobalMemoryDestroy(GlobalMemory context);
+extern void GlobalMemoryDestroy(GlobalMemory context);
 
 
 #endif							/* MCXT_H */
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index b87c331a1d7..8e9c184b9c6 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.9 1997/09/07 05:02:42 momjian Exp $
+ * $Id: memutils.h,v 1.10 1997/09/08 02:39:50 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -107,27 +107,27 @@ typedef OrderedSetData *OrderedSet;
 
 struct OrderedElemData
 {
-	OrderedElem		next;		/* Next elem or &this->set->dummy		*/
-	OrderedElem		prev;		/* Previous elem or &this->set->head	*/
-	OrderedSet		set;		/* Parent set							*/
+	OrderedElem next;			/* Next elem or &this->set->dummy		*/
+	OrderedElem prev;			/* Previous elem or &this->set->head	*/
+	OrderedSet	set;			/* Parent set							*/
 };
 
 struct OrderedSetData
 {
-	OrderedElem		head;		/* First elem or &this->dummy			*/
-	OrderedElem		dummy;		/* (hack) Terminator == NULL			*/
-	OrderedElem		tail;		/* Last elem or &this->head				*/
-	Offset			offset;		/* Offset from struct base to elem		*/
+	OrderedElem head;			/* First elem or &this->dummy			*/
+	OrderedElem dummy;			/* (hack) Terminator == NULL			*/
+	OrderedElem tail;			/* Last elem or &this->head				*/
+	Offset		offset;			/* Offset from struct base to elem		*/
 	/* this could be signed short int! */
 };
 
-extern void		OrderedSetInit(OrderedSet set, Offset offset);
-extern bool		OrderedSetContains(OrderedSet set, OrderedElem elem);
-extern Pointer	OrderedSetGetHead(OrderedSet set);
-extern Pointer	OrderedElemGetPredecessor(OrderedElem elem);
-extern Pointer	OrderedElemGetSuccessor(OrderedElem elem);
-extern void		OrderedElemPop(OrderedElem elem);
-extern void		OrderedElemPushInto(OrderedElem elem, OrderedSet Set);
+extern void OrderedSetInit(OrderedSet set, Offset offset);
+extern bool OrderedSetContains(OrderedSet set, OrderedElem elem);
+extern Pointer OrderedSetGetHead(OrderedSet set);
+extern Pointer OrderedElemGetPredecessor(OrderedElem elem);
+extern Pointer OrderedElemGetSuccessor(OrderedElem elem);
+extern void OrderedElemPop(OrderedElem elem);
+extern void OrderedElemPushInto(OrderedElem elem, OrderedSet Set);
 
 /*****************************************************************************
  *	  aset.h --			Allocation set definitions.							 *
@@ -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
 
@@ -203,9 +203,9 @@ typedef enum AllocMode
  */
 typedef struct AllocSetData
 {
-	OrderedSetData	setData;
+	OrderedSetData setData;
 	/* Note: this will change in the future to support other modes */
-}				AllocSetData;
+}			AllocSetData;
 
 typedef AllocSetData *AllocSet;
 
@@ -221,18 +221,18 @@ typedef AllocSetData *AllocSet;
  */
 #define AllocSetIsValid(set) PointerIsValid(set)
 
-extern void		AllocSetInit(AllocSet set, AllocMode mode, Size limit);
+extern void AllocSetInit(AllocSet set, AllocMode mode, Size limit);
 
-extern void		AllocSetReset(AllocSet set);
+extern void AllocSetReset(AllocSet set);
 
-extern bool		AllocSetContains(AllocSet set, AllocPointer pointer);
+extern bool AllocSetContains(AllocSet set, AllocPointer pointer);
 extern AllocPointer AllocSetAlloc(AllocSet set, Size size);
-extern void		AllocSetFree(AllocSet set, AllocPointer pointer);
-extern AllocPointer
+extern void AllocSetFree(AllocSet set, AllocPointer pointer);
+extern		AllocPointer
 AllocSetRealloc(AllocSet set, AllocPointer pointer,
 				Size size);
 
-extern void		AllocSetDump(AllocSet set);
+extern void AllocSetDump(AllocSet set);
 
 /*****************************************************************************
  *	  clib.h --			Standard C library definitions						 *
@@ -247,7 +247,7 @@ extern void		AllocSetDump(AllocSet set);
  *		LibCCopyLength is only used within this file. -cim 6/12/90
  *
  */
-typedef int		LibCCopyLength;
+typedef int LibCCopyLength;
 
 /*
  * MemoryCopy --
@@ -262,7 +262,7 @@ typedef int		LibCCopyLength;
 
 #define MaxBitsPerByte	8
 
-typedef uint32	AttributeSize;	/* XXX should be defined elsewhere */
+typedef uint32 AttributeSize;	/* XXX should be defined elsewhere */
 
 #define MaxHeapTupleSize		0x7fffffff
 #define MaxAttributeSize		0x7fffffff
diff --git a/src/include/utils/module.h b/src/include/utils/module.h
index cadff1aa6c3..2b528fed8ff 100644
--- a/src/include/utils/module.h
+++ b/src/include/utils/module.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: module.h,v 1.2 1997/09/07 05:02:44 momjian Exp $
+ * $Id: module.h,v 1.3 1997/09/08 02:39:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,6 @@
 /*
  * prototypes for functions in init/enbl.c
  */
-extern bool		BypassEnable(int *enableCountInOutP, bool on);
+extern bool BypassEnable(int *enableCountInOutP, bool on);
 
 #endif							/* MODULE_H */
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 5372501bcb0..f1a065caf4a 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nabstime.h,v 1.11 1997/09/07 05:02:46 momjian Exp $
+ * $Id: nabstime.h,v 1.12 1997/09/08 02:39:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,14 +23,14 @@
  *
  * ----------------------------------------------------------------
  */
-typedef int32	AbsoluteTime;
-typedef int32	RelativeTime;
+typedef int32 AbsoluteTime;
+typedef int32 RelativeTime;
 
 typedef struct
 {
-	int32			status;
-	AbsoluteTime	data[2];
-}				TimeIntervalData;
+	int32		status;
+	AbsoluteTime data[2];
+}			TimeIntervalData;
 typedef TimeIntervalData *TimeInterval;
 
 /*
@@ -102,22 +102,22 @@ extern AbsoluteTime GetCurrentAbsoluteTime(void);
  * nabstime.c prototypes
  */
 extern AbsoluteTime nabstimein(char *timestr);
-extern char    *nabstimeout(AbsoluteTime time);
+extern char *nabstimeout(AbsoluteTime time);
 
-extern bool		abstimeeq(AbsoluteTime t1, AbsoluteTime t2);
-extern bool		abstimene(AbsoluteTime t1, AbsoluteTime t2);
-extern bool		abstimelt(AbsoluteTime t1, AbsoluteTime t2);
-extern bool		abstimegt(AbsoluteTime t1, AbsoluteTime t2);
-extern bool		abstimele(AbsoluteTime t1, AbsoluteTime t2);
-extern bool		abstimege(AbsoluteTime t1, AbsoluteTime t2);
-extern bool		abstime_finite(AbsoluteTime time);
+extern bool abstimeeq(AbsoluteTime t1, AbsoluteTime t2);
+extern bool abstimene(AbsoluteTime t1, AbsoluteTime t2);
+extern bool abstimelt(AbsoluteTime t1, AbsoluteTime t2);
+extern bool abstimegt(AbsoluteTime t1, AbsoluteTime t2);
+extern bool abstimele(AbsoluteTime t1, AbsoluteTime t2);
+extern bool abstimege(AbsoluteTime t1, AbsoluteTime t2);
+extern bool abstime_finite(AbsoluteTime time);
 
 extern AbsoluteTime datetime_abstime(DateTime * datetime);
 extern DateTime *abstime_datetime(AbsoluteTime abstime);
 
-extern bool		AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2);
-extern bool		AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2);
+extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2);
+extern bool AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2);
 
-extern void		abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn);
+extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn);
 
 #endif							/* NABSTIME_H */
diff --git a/src/include/utils/oidcompos.h b/src/include/utils/oidcompos.h
index f4980051f05..118078de85e 100644
--- a/src/include/utils/oidcompos.h
+++ b/src/include/utils/oidcompos.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: oidcompos.h,v 1.2 1997/09/07 05:02:47 momjian Exp $
+ * $Id: oidcompos.h,v 1.3 1997/09/08 02:39:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,39 +14,39 @@
 #define OIDCOMPOS_H
 
 /* oidint4.c */
-OidInt4			oidint4in(char *o);
-char		   *oidint4out(OidInt4 o);
-bool			oidint4lt(OidInt4 o1, OidInt4 o2);
-bool			oidint4le(OidInt4 o1, OidInt4 o2);
-bool			oidint4eq(OidInt4 o1, OidInt4 o2);
-bool			oidint4ge(OidInt4 o1, OidInt4 o2);
-bool			oidint4gt(OidInt4 o1, OidInt4 o2);
-bool			oidint4ne(OidInt4 o1, OidInt4 o2);
-int				oidint4cmp(OidInt4 o1, OidInt4 o2);
-OidInt4			mkoidint4(Oid v_oid, uint32 v_int4);
+OidInt4		oidint4in(char *o);
+char	   *oidint4out(OidInt4 o);
+bool		oidint4lt(OidInt4 o1, OidInt4 o2);
+bool		oidint4le(OidInt4 o1, OidInt4 o2);
+bool		oidint4eq(OidInt4 o1, OidInt4 o2);
+bool		oidint4ge(OidInt4 o1, OidInt4 o2);
+bool		oidint4gt(OidInt4 o1, OidInt4 o2);
+bool		oidint4ne(OidInt4 o1, OidInt4 o2);
+int			oidint4cmp(OidInt4 o1, OidInt4 o2);
+OidInt4		mkoidint4(Oid v_oid, uint32 v_int4);
 
 /* oidint2.c */
-OidInt2			oidint2in(char *o);
-char		   *oidint2out(OidInt2 o);
-bool			oidint2lt(OidInt2 o1, OidInt2 o2);
-bool			oidint2le(OidInt2 o1, OidInt2 o2);
-bool			oidint2eq(OidInt2 o1, OidInt2 o2);
-bool			oidint2ge(OidInt2 o1, OidInt2 o2);
-bool			oidint2gt(OidInt2 o1, OidInt2 o2);
-bool			oidint2ne(OidInt2 o1, OidInt2 o2);
-int				oidint2cmp(OidInt2 o1, OidInt2 o2);
-OidInt2			mkoidint2(Oid v_oid, uint16 v_int2);
+OidInt2		oidint2in(char *o);
+char	   *oidint2out(OidInt2 o);
+bool		oidint2lt(OidInt2 o1, OidInt2 o2);
+bool		oidint2le(OidInt2 o1, OidInt2 o2);
+bool		oidint2eq(OidInt2 o1, OidInt2 o2);
+bool		oidint2ge(OidInt2 o1, OidInt2 o2);
+bool		oidint2gt(OidInt2 o1, OidInt2 o2);
+bool		oidint2ne(OidInt2 o1, OidInt2 o2);
+int			oidint2cmp(OidInt2 o1, OidInt2 o2);
+OidInt2		mkoidint2(Oid v_oid, uint16 v_int2);
 
 /* oidname.c */
-OidName			oidnamein(char *inStr);
-char		   *oidnameout(OidName oidname);
-bool			oidnamelt(OidName o1, OidName o2);
-bool			oidnamele(OidName o1, OidName o2);
-bool			oidnameeq(OidName o1, OidName o2);
-bool			oidnamene(OidName o1, OidName o2);
-bool			oidnamege(OidName o1, OidName o2);
-bool			oidnamegt(OidName o1, OidName o2);
-int				oidnamecmp(OidName o1, OidName o2);
-OidName			mkoidname(Oid id, char *name);
+OidName		oidnamein(char *inStr);
+char	   *oidnameout(OidName oidname);
+bool		oidnamelt(OidName o1, OidName o2);
+bool		oidnamele(OidName o1, OidName o2);
+bool		oidnameeq(OidName o1, OidName o2);
+bool		oidnamene(OidName o1, OidName o2);
+bool		oidnamege(OidName o1, OidName o2);
+bool		oidnamegt(OidName o1, OidName o2);
+int			oidnamecmp(OidName o1, OidName o2);
+OidName		mkoidname(Oid id, char *name);
 
 #endif							/* OIDCOMPOS_H */
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index b4a35db9795..b6f32c4f01b 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: palloc.h,v 1.4 1997/09/07 05:02:49 momjian Exp $
+ * $Id: palloc.h,v 1.5 1997/09/08 02:39:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,11 +15,11 @@
 
 #include <c.h>
 
-extern void    *palloc(Size size);
-extern void		pfree(void *pointer);
-extern void    *repalloc(void *pointer, Size size);
+extern void *palloc(Size size);
+extern void pfree(void *pointer);
+extern void *repalloc(void *pointer, Size size);
 
 /* like strdup except uses palloc */
-extern char    *pstrdup(char *pointer);
+extern char *pstrdup(char *pointer);
 
 #endif							/* PALLOC_H */
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 07edce974ef..84a5d539af4 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.5 1997/09/07 05:02:51 momjian Exp $
+ * $Id: portal.h,v 1.6 1997/09/08 02:39:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,9 +32,9 @@
 
 typedef struct PortalBlockData
 {
-	AllocSetData	setData;
-	FixedItemData	itemData;
-}				PortalBlockData;
+	AllocSetData setData;
+	FixedItemData itemData;
+}			PortalBlockData;
 
 typedef PortalBlockData *PortalBlock;
 
@@ -43,13 +43,13 @@ typedef PortalD *Portal;
 
 struct PortalD
 {
-	char		   *name;		/* XXX PortalName */
+	char	   *name;			/* XXX PortalName */
 	struct PortalVariableMemory variable;
 	struct PortalHeapMemory heap;
-	QueryDesc	   *queryDesc;
-	TupleDesc		attinfo;
-	EState		   *state;
-	void			(*cleanup) (Portal);
+	QueryDesc  *queryDesc;
+	TupleDesc	attinfo;
+	EState	   *state;
+	void		(*cleanup) (Portal);
 };
 
 /*
@@ -63,21 +63,21 @@ struct PortalD
  */
 #define VACPNAME		"<vacuum>"
 
-extern bool		PortalNameIsSpecial(char *pname);
-extern void		AtEOXact_portals(void);
-extern void		EnablePortalManager(bool on);
-extern Portal	GetPortalByName(char *name);
-extern Portal	BlankPortalAssignName(char *name);
+extern bool PortalNameIsSpecial(char *pname);
+extern void AtEOXact_portals(void);
+extern void EnablePortalManager(bool on);
+extern Portal GetPortalByName(char *name);
+extern Portal BlankPortalAssignName(char *name);
 extern void
 PortalSetQuery(Portal portal, QueryDesc * queryDesc,
 			   TupleDesc attinfo, EState * state,
 			   void (*cleanup) (Portal portal));
 extern QueryDesc *PortalGetQueryDesc(Portal portal);
-extern EState  *PortalGetState(Portal portal);
-extern Portal	CreatePortal(char *name);
-extern void		PortalDestroy(Portal * portalP);
-extern void		StartPortalAllocMode(AllocMode mode, Size limit);
-extern void		EndPortalAllocMode(void);
+extern EState *PortalGetState(Portal portal);
+extern Portal CreatePortal(char *name);
+extern void PortalDestroy(Portal * portalP);
+extern void StartPortalAllocMode(AllocMode mode, Size limit);
+extern void EndPortalAllocMode(void);
 extern PortalVariableMemory PortalGetVariableMemory(Portal portal);
 extern PortalHeapMemory PortalGetHeapMemory(Portal portal);
 
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
index fe5e0b2f357..01fa4153c1e 100644
--- a/src/include/utils/psort.h
+++ b/src/include/utils/psort.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: psort.h,v 1.8 1997/09/07 05:02:53 momjian Exp $
+ * $Id: psort.h,v 1.9 1997/09/08 02:39:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,17 +24,17 @@
 
 struct tape
 {
-	int				tp_dummy;	/* (D) */
-	int				tp_fib;		/* (A) */
-	FILE		   *tp_file;	/* (TAPE) */
-	struct tape    *tp_prev;
+	int			tp_dummy;		/* (D) */
+	int			tp_fib;			/* (A) */
+	FILE	   *tp_file;		/* (TAPE) */
+	struct tape *tp_prev;
 };
 
 struct cmplist
 {
-	int				cp_attn;	/* attribute number */
-	int				cp_num;		/* comparison function code */
-	int				cp_rev;		/* invert comparison flag */
+	int			cp_attn;		/* attribute number */
+	int			cp_num;			/* comparison function code */
+	int			cp_rev;			/* invert comparison flag */
 	struct cmplist *cp_next;	/* next in chain */
 };
 
@@ -47,25 +47,24 @@ typedef struct Psortstate
 {
 	LeftistContextData treeContext;
 
-	int				TapeRange;
-	int				Level;
-	int				TotalDummy;
-	struct tape		Tape[MAXTAPES];
+	int			TapeRange;
+	int			Level;
+	int			TotalDummy;
+	struct tape Tape[MAXTAPES];
 
-	int				BytesRead;
-	int				BytesWritten;
-	int				tupcount;
+	int			BytesRead;
+	int			BytesWritten;
+	int			tupcount;
 
 	struct leftist *Tuples;
 
-	FILE		   *psort_grab_file;
-	long			psort_current;		/* could be file offset, or array
-										 * index */
-	long			psort_saved;/* could be file offset, or array index */
-	bool			using_tape_files;
+	FILE	   *psort_grab_file;
+	long		psort_current;	/* could be file offset, or array index */
+	long		psort_saved;	/* could be file offset, or array index */
+	bool		using_tape_files;
 
-	HeapTuple	   *memtuples;
-}				Psortstate;
+	HeapTuple  *memtuples;
+}			Psortstate;
 
 #ifdef	EBUG
 #include <stdio.h>
@@ -99,10 +98,10 @@ if (1) CODE; else
 #endif
 
 /* psort.c */
-extern bool		psort_begin(Sort * node, int nkeys, ScanKey key);
+extern bool psort_begin(Sort * node, int nkeys, ScanKey key);
 extern HeapTuple psort_grabtuple(Sort * node);
-extern void		psort_markpos(Sort * node);
-extern void		psort_restorepos(Sort * node);
-extern void		psort_end(Sort * node);
+extern void psort_markpos(Sort * node);
+extern void psort_restorepos(Sort * node);
+extern void psort_end(Sort * node);
 
 #endif							/* PSORT_H */
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 31dcb7401ab..9fe943c58d6 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.10 1997/09/07 05:02:54 momjian Exp $
+ * $Id: rel.h,v 1.11 1997/09/08 02:39:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,47 +22,47 @@
 
 typedef struct Trigger
 {
-	char		   *tgname;
-	Oid				tgfoid;
-	func_ptr		tgfunc;
-	int16			tgtype;
-	int16			tgnargs;
-	int16			tgattr[8];
-	char		  **tgargs;
-}				Trigger;
+	char	   *tgname;
+	Oid			tgfoid;
+	func_ptr	tgfunc;
+	int16		tgtype;
+	int16		tgnargs;
+	int16		tgattr[8];
+	char	  **tgargs;
+}			Trigger;
 
 typedef struct TriggerDesc
 {
-	uint16			n_before_statement[4];
-	uint16			n_before_row[4];
-	uint16			n_after_row[4];
-	uint16			n_after_statement[4];
-	Trigger		  **tg_before_statement[4];
-	Trigger		  **tg_before_row[4];
-	Trigger		  **tg_after_row[4];
-	Trigger		  **tg_after_statement[4];
-	Trigger		   *triggers;
-}				TriggerDesc;
+	uint16		n_before_statement[4];
+	uint16		n_before_row[4];
+	uint16		n_after_row[4];
+	uint16		n_after_statement[4];
+	Trigger   **tg_before_statement[4];
+	Trigger   **tg_before_row[4];
+	Trigger   **tg_after_row[4];
+	Trigger   **tg_after_statement[4];
+	Trigger    *triggers;
+}			TriggerDesc;
 
 typedef struct RelationData
 {
-	File			rd_fd;		/* open file descriptor */
-	int				rd_nblocks; /* number of blocks in rel */
-	uint16			rd_refcnt;	/* reference count */
-	bool			rd_islocal; /* uses the local buffer mgr */
-	bool			rd_isnailed;/* rel is nailed in cache */
-	bool			rd_istemp;	/* rel is a temp rel */
-	bool			rd_tmpunlinked;		/* temp rel already unlinked */
-	Form_pg_am		rd_am;		/* AM tuple */
-	Form_pg_class	rd_rel;		/* RELATION tuple */
-	Oid				rd_id;		/* relations's object id */
-	Pointer			lockInfo;	/* ptr. to misc. info. */
-	TupleDesc		rd_att;		/* tuple desciptor */
-	RuleLock	   *rd_rules;	/* rewrite rules */
-	IndexStrategy	rd_istrat;
-	RegProcedure   *rd_support;
-	TriggerDesc    *trigdesc;
-}				RelationData;
+	File		rd_fd;			/* open file descriptor */
+	int			rd_nblocks;		/* number of blocks in rel */
+	uint16		rd_refcnt;		/* reference count */
+	bool		rd_islocal;		/* uses the local buffer mgr */
+	bool		rd_isnailed;	/* rel is nailed in cache */
+	bool		rd_istemp;		/* rel is a temp rel */
+	bool		rd_tmpunlinked; /* temp rel already unlinked */
+	Form_pg_am	rd_am;			/* AM tuple */
+	Form_pg_class rd_rel;		/* RELATION tuple */
+	Oid			rd_id;			/* relations's object id */
+	Pointer		lockInfo;		/* ptr. to misc. info. */
+	TupleDesc	rd_att;			/* tuple desciptor */
+	RuleLock   *rd_rules;		/* rewrite rules */
+	IndexStrategy rd_istrat;
+	RegProcedure *rd_support;
+	TriggerDesc *trigdesc;
+}			RelationData;
 
 typedef RelationData *Relation;
 
@@ -76,7 +76,7 @@ typedef Relation *RelationPtr;
 
 #define InvalidRelation ((Relation)NULL)
 
-typedef char	ArchiveMode;
+typedef char ArchiveMode;
 
 /*
  * RelationIsValid --
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 984d0cc63ae..00e6c8c3436 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relcache.h,v 1.7 1997/09/07 05:03:00 momjian Exp $
+ * $Id: relcache.h,v 1.8 1997/09/08 02:39:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,17 +22,17 @@ extern Relation RelationIdCacheGetRelation(Oid relationId);
 extern Relation RelationIdGetRelation(Oid relationId);
 extern Relation RelationNameGetRelation(char *relationName);
 
-extern void		RelationClose(Relation relation);
-extern void		RelationForgetRelation(Oid rid);
-extern void		RelationIdInvalidateRelationCacheByRelationId(Oid relationId);
+extern void RelationClose(Relation relation);
+extern void RelationForgetRelation(Oid rid);
+extern void RelationIdInvalidateRelationCacheByRelationId(Oid relationId);
 
 extern void
-				RelationIdInvalidateRelationCacheByAccessMethodId(Oid accessMethodId);
+			RelationIdInvalidateRelationCacheByAccessMethodId(Oid accessMethodId);
 
-extern void		RelationCacheInvalidate(bool onlyFlushReferenceCountZero);
+extern void RelationCacheInvalidate(bool onlyFlushReferenceCountZero);
 
-extern void		RelationRegisterRelation(Relation relation);
-extern void		RelationPurgeLocalRelation(bool xactComitted);
-extern void		RelationInitialize(void);
+extern void RelationRegisterRelation(Relation relation);
+extern void RelationPurgeLocalRelation(bool xactComitted);
+extern void RelationInitialize(void);
 
 #endif							/* RELCACHE_H */
diff --git a/src/include/utils/sets.h b/src/include/utils/sets.h
index 717989bdfe3..f928b4012b5 100644
--- a/src/include/utils/sets.h
+++ b/src/include/utils/sets.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sets.h,v 1.2 1997/09/07 05:03:01 momjian Exp $
+ * $Id: sets.h,v 1.3 1997/09/08 02:39:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 /* Temporary name of set, before SetDefine changes it. */
 #define GENERICSETNAME "zyxset"
 
-extern Oid		SetDefine(char *querystr, char *typename);
-extern int		seteval(Oid funcoid);
+extern Oid	SetDefine(char *querystr, char *typename);
+extern int	seteval(Oid funcoid);
 
 #endif							/* SETS_H */
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index db830e3cd2f..627356e29a3 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.5 1997/09/07 05:03:02 momjian Exp $
+ * $Id: syscache.h,v 1.6 1997/09/08 02:39:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include <access/attnum.h>
 #include <access/htup.h>
 
- /*#define CACHEDEBUG*//* turns DEBUG elogs on */
+ /* #define CACHEDEBUG *//* turns DEBUG elogs on */
 
 
 /*
@@ -66,32 +66,32 @@
  */
 struct cachedesc
 {
-	char		   *name;		/* this is Name * so that we can
+	char	   *name;			/* this is Name * so that we can
 								 * initialize it */
-	int				nkeys;
-	int				key[4];
-	int				size;		/* sizeof(appropriate struct) */
-	char		   *indname;	/* index relation for this cache, if
+	int			nkeys;
+	int			key[4];
+	int			size;			/* sizeof(appropriate struct) */
+	char	   *indname;		/* index relation for this cache, if
 								 * exists */
-					HeapTuple(*iScanFunc) ();	/* function to handle
+				HeapTuple(*iScanFunc) ();		/* function to handle
 												 * index scans */
 };
 
-extern void		zerocaches(void);
-extern void		InitCatalogCache(void);
-extern HeapTuple
+extern void zerocaches(void);
+extern void InitCatalogCache(void);
+extern		HeapTuple
 SearchSysCacheTuple(int cacheId, Datum key1, Datum key2,
 					Datum key3, Datum key4);
-extern int32
+extern		int32
 SearchSysCacheStruct(int cacheId, char *returnStruct,
 					 Datum key1, Datum key2, Datum key3, Datum key4);
-extern void    *
+extern void *
 SearchSysCacheGetAttribute(int cacheId,
 						   AttrNumber attributeNumber,
 						   Datum key1,
 						   Datum key2,
 						   Datum key3,
 						   Datum key4);
-extern void    *TypeDefaultRetrieve(Oid typId);
+extern void *TypeDefaultRetrieve(Oid typId);
 
 #endif							/* SYSCACHE_H */
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index a32ccb2ab13..579c6e9525e 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tqual.h,v 1.7 1997/09/07 05:03:03 momjian Exp $
+ * $Id: tqual.h,v 1.8 1997/09/08 02:39:59 momjian Exp $
  *
  * NOTE
  *	  It may be desirable to allow time qualifications to indicate
@@ -21,8 +21,8 @@
 
 typedef struct TimeQualSpace
 {
-	char			data[12];
-}				TimeQualSpace;
+	char		data[12];
+}			TimeQualSpace;
 
 typedef Pointer TimeQual;
 
@@ -32,14 +32,14 @@ typedef Pointer TimeQual;
 /* As above, plus updates in this command */
 extern TimeQual SelfTimeQual;
 
-extern void		setheapoverride(bool on);
-extern bool		heapisoverride(void);
+extern void setheapoverride(bool on);
+extern bool heapisoverride(void);
 
 extern TimeQual TimeFormSnapshotTimeQual(AbsoluteTime time);
-extern TimeQual
+extern		TimeQual
 TimeFormRangedTimeQual(AbsoluteTime startTime,
 					   AbsoluteTime endTime);
-extern bool		HeapTupleSatisfiesTimeQual(HeapTuple tuple, TimeQual qual);
+extern bool HeapTupleSatisfiesTimeQual(HeapTuple tuple, TimeQual qual);
 
 
 #endif							/* TQUAL_H */
diff --git a/src/include/version.h b/src/include/version.h
index 14920ffd378..3c4c4e14e6e 100644
--- a/src/include/version.h
+++ b/src/include/version.h
@@ -4,7 +4,7 @@
  *	  this file contains the interface to version.c.
  *	  Also some parameters.
  *
- * $Id: version.h,v 1.3 1997/09/07 04:55:43 momjian Exp $
+ * $Id: version.h,v 1.4 1997/09/08 02:33:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -12,10 +12,10 @@
 #define VERSION_H
 
 void
-				ValidatePgVersion(const char *path, char **reason_p);
+			ValidatePgVersion(const char *path, char **reason_p);
 
 void
-				SetPgVersion(const char *path, char **reason_p);
+			SetPgVersion(const char *path, char **reason_p);
 
 #define PG_RELEASE		6
 #define PG_VERSION		1