Used modified version of indent that understands over 100 typedefs.

22 files changed, 137 insertions, 136 deletions

diff --git a/src/include/access/funcindex.h b/src/include/access/funcindex.h
index 9bd92e3a777..a996bb4738e 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.4 1997/09/08 02:34:03 momjian Exp $
+ * $Id: funcindex.h,v 1.5 1997/09/08 21:50:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ typedef struct
 	Oid			arglist[8];
 	Oid			procOid;
 	NameData	funcName;
-}			FuncIndexInfo;
+} FuncIndexInfo;
 
 typedef FuncIndexInfo *FuncIndexInfoPtr;
 
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 0bdf32bdc84..6bf54c84df1 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.9 1997/09/08 02:34:04 momjian Exp $
+ * $Id: genam.h,v 1.10 1997/09/08 21:50:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,30 +25,30 @@
 extern Relation index_open(Oid relationId);
 extern Relation index_openr(char *relationName);
 extern void index_close(Relation relation);
-extern		InsertIndexResult
+extern InsertIndexResult
 index_insert(Relation relation,
-			 Datum * datum, char *nulls,
+			 Datum *datum, char *nulls,
 			 ItemPointer heap_t_ctid,
 			 Relation heapRel);
 extern void index_delete(Relation relation, ItemPointer indexItem);
-extern		IndexScanDesc
+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 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);
+			  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);
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 5c04951aa4a..d6519cd132c 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -52,7 +52,7 @@
 typedef struct GISTPageOpaqueData
 {
 	uint32		flags;
-}			GISTPageOpaqueData;
+} GISTPageOpaqueData;
 
 typedef GISTPageOpaqueData *GISTPageOpaque;
 
@@ -67,7 +67,7 @@ typedef struct GISTSTACK
 	struct GISTSTACK *gs_parent;
 	OffsetNumber gs_child;
 	BlockNumber gs_blk;
-}			GISTSTACK;
+} GISTSTACK;
 
 typedef struct GISTSTATE
 {
@@ -80,7 +80,7 @@ typedef struct GISTSTATE
 	func_ptr	equalFn;
 	bool		haskeytype;
 	bool		keytypbyval;
-}			GISTSTATE;
+} GISTSTATE;
 
 
 /*
@@ -94,7 +94,7 @@ typedef struct GISTScanOpaqueData
 	struct GISTSTACK *s_markstk;
 	uint16		s_flags;
 	struct GISTSTATE *giststate;
-}			GISTScanOpaqueData;
+} GISTScanOpaqueData;
 
 typedef GISTScanOpaqueData *GISTScanOpaque;
 
@@ -134,7 +134,7 @@ typedef struct GIST_SPLITVEC
 	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;
+} GIST_SPLITVEC;
 
 /*
 ** An entry on a GiST node.  Contains the key (pred), as well as
@@ -150,7 +150,7 @@ typedef struct GISTENTRY
 	OffsetNumber offset;
 	int			bytes;
 	bool		leafkey;
-}			GISTENTRY;
+} GISTENTRY;
 
 /*
 ** macro to initialize a GISTENTRY
@@ -172,7 +172,7 @@ typedef struct txtrange
 	int32		vl_len;
 	int32		flag;
 	char		bytes[2];
-}			TXTRANGE;
+} TXTRANGE;
 
 typedef struct intrange
 {
@@ -184,23 +184,23 @@ typedef struct intrange
 	 * upper is positive infinity.	0 means that both are numbers.
 	 */
 	int			flag;
-}			INTRANGE;
+} INTRANGE;
 
 extern void
 gistbuild(Relation heap,
 		  Relation index, int natts,
 		  AttrNumber *attnum, IndexStrategy istrat,
-		  uint16 pint, Datum * params,
-		  FuncIndexInfo * finfo,
-		  PredInfo * predInfo);
-extern		InsertIndexResult
-gistinsert(Relation r, Datum * datum,
+		  uint16 pint, Datum *params,
+		  FuncIndexInfo *finfo,
+		  PredInfo *predInfo);
+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 gistfreestack(GISTSTACK *s);
+extern void initGISTstate(GISTSTATE *giststate, Relation index);
 extern void
-gistdentryinit(GISTSTATE * giststate, GISTENTRY * e, char *pr,
+gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
 			   Relation r, Page pg, OffsetNumber o, int b, bool l);
 extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure);
 
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index a5a5f782198..071238bd173 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -16,7 +16,7 @@
 #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);
diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h
index 42bdf847aef..1007dd3ec26 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 7d45a7e5b92..43d188245d6 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.10 1997/09/08 20:58:02 momjian Exp $
+ * $Id: hash.h,v 1.11 1997/09/08 21:50:44 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -82,7 +82,7 @@ typedef struct HashPageOpaqueData
 	OverflowPageAddress hasho_oaddr;	/* ovfl address of this ovfl pg */
 	BlockNumber hasho_nextblkno;/* next ovfl blkno */
 	BlockNumber hasho_prevblkno;/* previous ovfl (or bucket) blkno */
-}			HashPageOpaqueData;
+} HashPageOpaqueData;
 
 typedef HashPageOpaqueData *HashPageOpaque;
 
@@ -98,7 +98,7 @@ typedef struct HashScanOpaqueData
 {
 	Buffer		hashso_curbuf;
 	Buffer		hashso_mrkbuf;
-}			HashScanOpaqueData;
+} HashScanOpaqueData;
 
 typedef HashScanOpaqueData *HashScanOpaque;
 
@@ -160,7 +160,7 @@ typedef struct HashMetaPageData
 										 * splitpoints */
 	BlockNumber hashm_mapp[NCACHED];	/* blknumbers of ovfl page maps */
 	RegProcedure hashm_procid;	/* hash procedure id from pg_proc */
-}			HashMetaPageData;
+} HashMetaPageData;
 
 typedef HashMetaPageData *HashMetaPage;
 
@@ -180,7 +180,7 @@ extern bool BuildingHash;
 typedef struct HashItemData
 {
 	IndexTupleData hash_itup;
-}			HashItemData;
+} HashItemData;
 
 typedef HashItemData *HashItem;
 
@@ -251,9 +251,9 @@ typedef HashItemData *HashItem;
 extern void
 hashbuild(Relation heap, Relation index, int natts,
 		  AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
-		  Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
-extern		InsertIndexResult
-hashinsert(Relation rel, Datum * datum, char *nulls,
+		  Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
+extern InsertIndexResult
+hashinsert(Relation rel, Datum *datum, char *nulls,
 		   ItemPointer ht_ctid, Relation heapRel);
 extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir);
 extern char *
@@ -277,7 +277,7 @@ 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 hashname(NameData *n);
 
 /* private routines */
 
@@ -288,7 +288,7 @@ 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 int32
 _hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum,
 				 int32 nbits, int32 ndx);
 extern void
@@ -302,7 +302,7 @@ 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 Page
 _hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access,
 				   int to_access);
 extern void _hash_pageinit(Page page, Size size);
@@ -322,13 +322,13 @@ _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);
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index d3e2ae5bbe8..c30e4405bfa 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.14 1997/09/08 20:58:03 momjian Exp $
+ * $Id: heapam.h,v 1.15 1997/09/08 21:50:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -72,7 +72,7 @@ typedef struct HeapAccessStatisticsData
 	int			local_heapgettup;
 	int			local_RelationPutHeapTuple;
 	int			local_RelationPutLongHeapTuple;
-}			HeapAccessStatisticsData;
+} HeapAccessStatisticsData;
 
 typedef HeapAccessStatisticsData *HeapAccessStatistics;
 
@@ -117,13 +117,13 @@ 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 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 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);
@@ -139,19 +139,19 @@ extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]);
 extern void
 DataFill(char *data, TupleDesc tupleDesc,
 		 Datum value[], char nulls[], char *infomask,
-		 bits8 * bit);
+		 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 *
 fastgetattr(HeapTuple tup, int attnum,
-			TupleDesc att, bool * isnull);
+			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);
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 3b6b32b98f9..0b6653f3865 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.5 1997/09/08 02:34:12 momjian Exp $
+ * $Id: htup.h,v 1.6 1997/09/08 21:50:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,7 +58,7 @@ typedef struct HeapTupleData
 	/* 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 6b1bc08dce1..5e96f795058 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.6 1997/09/08 02:34:13 momjian Exp $
+ * $Id: ibit.h,v 1.7 1997/09/08 21:50:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ typedef struct IndexAttributeBitMapData
 {
 	char		bits[(MaxIndexAttributeNumber + MaxBitsPerByte - 1)
 					 /			 MaxBitsPerByte];
-}			IndexAttributeBitMapData;
+} IndexAttributeBitMapData;
 
 typedef IndexAttributeBitMapData *IndexAttributeBitMap;
 
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index 20fc9ecee3e..eb9a68193fb 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.6 1997/09/08 02:34:14 momjian Exp $
+ * $Id: iqual.h,v 1.7 1997/09/08 21:50:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,7 @@
 
 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 fa1ea6396f6..55363a268db 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.7 1997/09/08 02:34:15 momjian Exp $
+ * $Id: istrat.h,v 1.8 1997/09/08 21:50:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,24 +47,24 @@
  */
 #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);
 extern void
 IndexSupportInitialize(IndexStrategy indexStrategy,
-					   RegProcedure * indexSupport, Oid indexObjectId,
+					   RegProcedure *indexSupport, Oid indexObjectId,
 			  Oid accessMethodObjectId, StrategyNumber maxStrategyNumber,
 		 StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber);
 
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 09249822518..a1581133bfe 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.7 1997/09/08 02:34:16 momjian Exp $
+ * $Id: itup.h,v 1.8 1997/09/08 21:50:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,7 @@ typedef struct IndexTupleData
 	 * 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;
 
@@ -68,7 +68,7 @@ typedef struct PredInfo
 {
 	Node	   *pred;
 	Node	   *oldPred;
-}			PredInfo;
+} 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
+			  TupleDesc tupDesc, bool *isNullOutP);
+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 e902bbf228b..83388819610 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.17 1997/09/08 20:58:09 momjian Exp $
+ * $Id: nbtree.h,v 1.18 1997/09/08 21:50:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -213,12 +213,12 @@ 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);
 
@@ -244,9 +244,9 @@ 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
-btinsert(Relation rel, Datum * datum, char *nulls,
+		Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
+extern InsertIndexResult
+btinsert(Relation rel, Datum *datum, char *nulls,
 		 ItemPointer ht_ctid, Relation heapRel);
 extern char *btgettuple(IndexScanDesc scan, ScanDirection dir);
 extern char *
@@ -276,10 +276,10 @@ _bt_search(Relation rel, int keysz, ScanKey scankey,
 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);
@@ -289,10 +289,10 @@ 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);
 
@@ -303,7 +303,7 @@ 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 bool _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size *keysok);
 extern BTItem _bt_formitem(IndexTuple itup);
 
 /*
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index c4270c433ed..8b2eb5ed0d0 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.7 1997/09/08 02:34:22 momjian Exp $
+ * $Id: relscan.h,v 1.8 1997/09/08 21:50:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,7 @@ typedef struct HeapScanDescData
 	uint16		rs_cdelta;		/* current delta in chain */
 	uint16		rs_nkeys;		/* number of attributes in keys */
 	ScanKey		rs_key;			/* key descriptors */
-}			HeapScanDescData;
+} HeapScanDescData;
 
 typedef HeapScanDescData *HeapScanDesc;
 
@@ -55,7 +55,7 @@ typedef struct IndexScanDescData
 	bool		scanFromEnd;	/* restart scan at end? */
 	uint16		numberOfKeys;	/* number of key attributes */
 	ScanKey		keyData;		/* key descriptor */
-}			IndexScanDescData;
+} IndexScanDescData;
 
 typedef IndexScanDescData *IndexScanDesc;
 
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 57ceffd03cd..a6998aff4fa 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.9 1997/09/08 20:58:11 momjian Exp $
+ * $Id: rtree.h,v 1.10 1997/09/08 21:50:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,7 +43,7 @@
 typedef struct RTreePageOpaqueData
 {
 	uint32		flags;
-}			RTreePageOpaqueData;
+} RTreePageOpaqueData;
 
 typedef RTreePageOpaqueData *RTreePageOpaque;
 
@@ -56,7 +56,7 @@ typedef struct RTSTACK
 	struct RTSTACK *rts_parent;
 	OffsetNumber rts_child;
 	BlockNumber rts_blk;
-}			RTSTACK;
+} RTSTACK;
 
 /*
  *	When we're doing a scan, we need to keep track of the parent stack
@@ -75,7 +75,7 @@ typedef struct RTreeScanOpaqueData
 	uint16		s_flags;
 	uint16		s_internalNKey;
 	ScanKey		s_internalKey;
-}			RTreeScanOpaqueData;
+} 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,13 +114,13 @@ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
  *		RTree code.
  *		Defined in access/index-rtree/
  */
-extern		InsertIndexResult
-rtinsert(Relation r, Datum * datum, char *nulls,
+extern InsertIndexResult
+rtinsert(Relation r, Datum *datum, char *nulls,
 		 ItemPointer ht_ctid, Relation heapRel);
 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);
 
@@ -131,7 +131,7 @@ 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);
+		Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
 extern void _rtdump(Relation r);
 
 /* rtscan.c */
@@ -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/rtstrat.h b/src/include/access/rtstrat.h
index e03cc42acba..2036ffd6ecd 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.3 1997/09/08 02:34:25 momjian Exp $
+ * $Id: rtstrat.h,v 1.4 1997/09/08 21:50:59 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 3de53f89964..f40efc1e5b4 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.5 1997/09/08 02:34:26 momjian Exp $
+ * $Id: skey.h,v 1.6 1997/09/08 21:51:01 momjian Exp $
  *
  *
  * Note:
@@ -26,7 +26,7 @@ typedef struct ScanKeyData
 	func_ptr	sk_func;
 	int32		sk_nargs;
 	Datum		sk_argument;	/* data to compare */
-}			ScanKeyData;
+} ScanKeyData;
 
 typedef ScanKeyData *ScanKey;
 
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index be8436790ab..0ad737b36ce 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.7 1997/09/08 20:58:12 momjian Exp $
+ * $Id: strat.h,v 1.8 1997/09/08 21:51:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,11 +23,12 @@ typedef uint16 StrategyNumber;
 typedef struct StrategyTransformMapData
 {
 	StrategyNumber strategy[1]; /* VARIABLE LENGTH ARRAY */
-}			StrategyTransformMapData;	/* VARIABLE LENGTH
+} StrategyTransformMapData;		/* VARIABLE LENGTH
 
-										 *
-										 *
-										 * STRUCTURE */
+								 *
+								 *
+								 *
+								 * STRUCTURE */
 
 typedef StrategyTransformMapData *StrategyTransformMap;
 
@@ -35,7 +36,7 @@ typedef struct StrategyOperatorData
 {
 	StrategyNumber strategy;
 	bits16		flags;			/* scan qualification flags h/skey.h */
-}			StrategyOperatorData;
+} StrategyOperatorData;
 
 typedef StrategyOperatorData *StrategyOperator;
 
@@ -43,14 +44,14 @@ typedef struct StrategyTermData
 {								/* conjunctive term */
 	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 */
+} StrategyExpressionData;		/* VARIABLE LENGTH STRUCTURE */
 
 typedef StrategyExpressionData *StrategyExpression;
 
@@ -61,7 +62,7 @@ typedef struct StrategyEvaluationData
 	StrategyTransformMap commuteTransform;
 	StrategyTransformMap negateCommuteTransform;
 	StrategyExpression expression[12];	/* XXX VARIABLE LENGTH */
-}			StrategyEvaluationData;		/* VARIABLE LENGTH STRUCTURE */
+} StrategyEvaluationData;		/* VARIABLE LENGTH STRUCTURE */
 
 typedef StrategyEvaluationData *StrategyEvaluation;
 
@@ -81,14 +82,14 @@ typedef StrategyEvaluationData *StrategyEvaluation;
 typedef struct StrategyMapData
 {
 	ScanKeyData entry[1];		/* VARIABLE LENGTH ARRAY */
-}			StrategyMapData;	/* VARIABLE LENGTH STRUCTURE */
+} 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 db95804e16e..efb6e824a7a 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.10 1997/09/08 20:58:12 momjian Exp $
+ * $Id: transam.h,v 1.11 1997/09/08 21:51:03 momjian Exp $
  *
  *	 NOTES
  *		Transaction System Version 101 now support proper oid
@@ -86,7 +86,7 @@ typedef unsigned char XidStatus;/* (2 bits) */
 typedef struct LogRelationContentsData
 {
 	int			TransSystemVersion;
-}			LogRelationContentsData;
+} LogRelationContentsData;
 
 typedef LogRelationContentsData *LogRelationContents;
 
@@ -105,7 +105,7 @@ typedef LogRelationContentsData *LogRelationContents;
 typedef struct TimeRelationContentsData
 {
 	int			TransSystemVersion;
-}			TimeRelationContentsData;
+} TimeRelationContentsData;
 
 typedef TimeRelationContentsData *TimeRelationContents;
 
@@ -131,7 +131,7 @@ typedef struct VariableRelationContentsData
 	TransactionId nextXidData;
 	TransactionId lastXidData;
 	Oid			nextOid;
-}			VariableRelationContentsData;
+} VariableRelationContentsData;
 
 typedef VariableRelationContentsData *VariableRelationContents;
 
@@ -155,26 +155,26 @@ 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);
+				BlockNumber blockNumber, TransactionId xid, bool *failP);
 extern void
 TransBlockNumberSetXidStatus(Relation relation,
 		   BlockNumber blockNumber, TransactionId xid, XidStatus xstatus,
-							 bool * failP);
+							 bool *failP);
 extern AbsoluteTime
 TransBlockNumberGetCommitTime(Relation relation,
-			   BlockNumber blockNumber, TransactionId xid, bool * failP);
+				BlockNumber blockNumber, TransactionId xid, bool *failP);
 extern void
 TransBlockNumberSetCommitTime(Relation relation,
 		  BlockNumber blockNumber, TransactionId xid, AbsoluteTime xtime,
-							  bool * failP);
+							  bool *failP);
 
 /* in transam/varsup.c */
 extern void VariableRelationPutNextXid(TransactionId xid);
-extern void GetNewTransactionId(TransactionId * xid);
+extern void GetNewTransactionId(TransactionId *xid);
 extern void UpdateLastCommittedXid(TransactionId xid);
-extern void GetNewObjectId(Oid * oid_return);
+extern void GetNewObjectId(Oid *oid_return);
 extern void CheckMaxObjectId(Oid assigned_oid);
 
 /* ----------------
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index fe7939119c9..3b13dcde910 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.11 1997/09/08 20:58:13 momjian Exp $
+ * $Id: tupdesc.h,v 1.12 1997/09/08 21:51:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,7 @@ typedef struct constrCheck
 	char	   *ccname;
 	char	   *ccbin;
 	char	   *ccsrc;
-}			ConstrCheck;
+} ConstrCheck;
 
 /* This structure contains constraints of a tuple */
 typedef struct tupleConstr
@@ -40,7 +40,7 @@ typedef struct tupleConstr
 	uint16		num_defval;
 	uint16		num_check;
 	bool		has_not_null;
-}			TupleConstr;
+} TupleConstr;
 
 /*
  * This structure contains all information (i.e. from Classes
@@ -65,7 +65,7 @@ extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc);
 
 extern void FreeTupleDesc(TupleDesc tupdesc);
 
-extern		bool
+extern bool
 TupleDescInitEntry(TupleDesc desc,
 				   AttrNumber attributeNumber,
 				   char *attributeName,
@@ -73,6 +73,6 @@ TupleDescInitEntry(TupleDesc desc,
 				   int attdim,
 				   bool attisset);
 
-extern TupleDesc BuildDescForRelation(List * schema, char *relname);
+extern TupleDesc BuildDescForRelation(List *schema, char *relname);
 
 #endif							/* TUPDESC_H */
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 58d1eb56429..7b047d66d68 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.6 1997/09/08 02:34:32 momjian Exp $
+ * $Id: valid.h,v 1.7 1997/09/08 21:51:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,11 +22,11 @@
  * ----------------
  */
 
-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,
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 69aea57ff11..67f59425361 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.8 1997/09/08 02:34:33 momjian Exp $
+ * $Id: xact.h,v 1.9 1997/09/08 21:51:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@ typedef struct TransactionStateData
 	AbsoluteTime startTime;
 	int			state;
 	int			blockState;
-}			TransactionStateData;
+} TransactionStateData;
 
 /* ----------------
  *		transaction states
@@ -89,12 +89,12 @@ 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 void StoreInvalidTransactionId(TransactionId *destination);
 extern void
 TransactionIdStore(TransactionId transactionId,
-				   TransactionId * destination);
+				   TransactionId *destination);
 extern bool TransactionIdEquals(TransactionId id1, TransactionId id2);
 extern bool TransactionIdIsLessThan(TransactionId id1, TransactionId id2);
-extern void TransactionIdAdd(TransactionId * xid, int value);
+extern void TransactionIdAdd(TransactionId *xid, int value);
 
 #endif							/* XACT_H */