Add typdefs to pgindent run.

27 files changed, 132 insertions, 131 deletions

diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index c80d206cb0..5c04951aa4 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -189,7 +189,7 @@ typedef struct intrange
 extern void
 gistbuild(Relation heap,
 		  Relation index, int natts,
-		  AttrNumber * attnum, IndexStrategy istrat,
+		  AttrNumber *attnum, IndexStrategy istrat,
 		  uint16 pint, Datum * params,
 		  FuncIndexInfo * finfo,
 		  PredInfo * predInfo);
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 7dc33fa154..aff389b1e9 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -250,7 +250,7 @@ typedef HashItemData *HashItem;
 
 extern void
 hashbuild(Relation heap, Relation index, int natts,
-		  AttrNumber * attnum, IndexStrategy istrat, uint16 pcount,
+		  AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
 		  Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
 extern		InsertIndexResult
 hashinsert(Relation rel, Datum * datum, char *nulls,
@@ -286,7 +286,7 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem);
 
 
 /* hashovfl.c */
-extern Buffer _hash_addovflpage(Relation rel, Buffer * metabufp, Buffer buf);
+extern Buffer _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf);
 extern Buffer _hash_freeovflpage(Relation rel, Buffer ovflbuf);
 extern		int32
 _hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum,
@@ -303,7 +303,7 @@ extern void _hash_relbuf(Relation rel, Buffer buf, int access);
 extern void _hash_wrtbuf(Relation rel, Buffer buf);
 extern void _hash_wrtnorelbuf(Relation rel, Buffer buf);
 extern		Page
-_hash_chgbufaccess(Relation rel, Buffer * bufp, int from_access,
+_hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access,
 				   int to_access);
 extern void _hash_pageinit(Page page, Size size);
 extern void _hash_pagedel(Relation rel, ItemPointer tid);
@@ -319,11 +319,11 @@ extern void _hash_adjscans(Relation rel, ItemPointer tid);
 /* hashsearch.c */
 extern void
 _hash_search(Relation rel, int keysz, ScanKey scankey,
-			 Buffer * bufP, HashMetaPage metap);
+			 Buffer *bufP, HashMetaPage metap);
 extern RetrieveIndexResult _hash_next(IndexScanDesc scan, ScanDirection dir);
 extern RetrieveIndexResult _hash_first(IndexScanDesc scan, ScanDirection dir);
 extern		bool
-_hash_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir,
+_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir,
 		   Buffer metabuf);
 
 
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 2cb46a871f..0a83893d01 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -122,10 +122,10 @@ heap_beginscan(Relation relation, int atend,
 			   TimeQual timeQual, unsigned nkeys, ScanKey key);
 extern void heap_rescan(HeapScanDesc sdesc, bool scanFromEnd, ScanKey key);
 extern void heap_endscan(HeapScanDesc sdesc);
-extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer * b);
+extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b);
 extern		HeapTuple
 heap_fetch(Relation relation, TimeQual timeQual,
-		   ItemPointer tid, Buffer * b);
+		   ItemPointer tid, Buffer *b);
 extern Oid	heap_insert(Relation relation, HeapTuple tup);
 extern int	heap_delete(Relation relation, ItemPointer tid);
 extern int
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 8a6e1bed4d..0431973807 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -50,7 +50,7 @@ typedef struct BTPageOpaqueData
 #define BTP_META		(1 << 3)
 #define BTP_CHAIN		(1 << 4)
 
-}			BTPageOpaqueData;
+} BTPageOpaqueData;
 
 typedef BTPageOpaqueData *BTPageOpaque;
 
@@ -74,7 +74,7 @@ typedef struct BTScanOpaqueData
 	uint16		numberOfFirstKeys;		/* number of keys for 1st
 										 * attribute */
 	ScanKey		keyData;		/* key descriptor */
-}			BTScanOpaqueData;
+} BTScanOpaqueData;
 
 typedef BTScanOpaqueData *BTScanOpaque;
 
@@ -104,7 +104,7 @@ typedef struct BTItemData
 								 * 8-byte boundary */
 #endif
 	IndexTupleData bti_itup;
-}			BTItemData;
+} BTItemData;
 
 typedef BTItemData *BTItem;
 
@@ -135,7 +135,7 @@ typedef struct BTStackData
 	OffsetNumber bts_offset;
 	BTItem		bts_btitem;
 	struct BTStackData *bts_parent;
-}			BTStackData;
+} BTStackData;
 
 typedef BTStackData *BTStack;
 
@@ -149,7 +149,7 @@ typedef struct BTPageState
 	int			btps_level;
 	bool		btps_doupper;
 	struct BTPageState *btps_next;
-}			BTPageState;
+} BTPageState;
 
 /*
  *	We need to be able to tell the difference between read and write
@@ -243,7 +243,7 @@ extern bool BuildingBtree;		/* in nbtree.c */
 
 extern void
 btbuild(Relation heap, Relation index, int natts,
-		AttrNumber * attnum, IndexStrategy istrat, uint16 pcount,
+		AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
 		Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
 extern		InsertIndexResult
 btinsert(Relation rel, Datum * datum, char *nulls,
@@ -270,10 +270,10 @@ extern void _bt_adjscans(Relation rel, ItemPointer tid, int op);
 /*
  * prototypes for functions in nbtsearch.c
  */
-extern		BTStack
+extern BTStack
 _bt_search(Relation rel, int keysz, ScanKey scankey,
-		   Buffer * bufP);
-extern		Buffer
+		   Buffer *bufP);
+extern Buffer
 _bt_moveright(Relation rel, Buffer buf, int keysz,
 			  ScanKey scankey, int access);
 extern		bool
@@ -284,7 +284,7 @@ _bt_binsrch(Relation rel, Buffer buf, int keysz,
 			ScanKey scankey, int srchtype);
 extern RetrieveIndexResult _bt_next(IndexScanDesc scan, ScanDirection dir);
 extern RetrieveIndexResult _bt_first(IndexScanDesc scan, ScanDirection dir);
-extern bool _bt_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir);
+extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
 
 /*
  * prototypes for functions in nbtstrat.c
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 986e1d1fd2..1ad7808bc8 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -130,7 +130,7 @@ extern void rtrestrpos(IndexScanDesc s);
 extern void rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
 extern void
 rtbuild(Relation heap, Relation index, int natts,
-		AttrNumber * attnum, IndexStrategy istrat, uint16 pcount,
+		AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
 		Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
 extern void _rtdump(Relation r);
 
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index 96bef2da38..dbd7047e4b 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -26,6 +26,7 @@ typedef struct StrategyTransformMapData
 }			StrategyTransformMapData;	/* VARIABLE LENGTH
 
 										 *
+										 *
 										 * STRUCTURE */
 
 typedef StrategyTransformMapData *StrategyTransformMap;
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index faef3f188a..1ef0adab5a 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -154,7 +154,7 @@ extern void TransactionIdAbort(TransactionId transactionId);
 extern void AmiTransactionOverride(bool flag);
 extern void
 TransComputeBlockNumber(Relation relation,
-			 TransactionId transactionId, BlockNumber * blockNumberOutP);
+			  TransactionId transactionId, BlockNumber *blockNumberOutP);
 extern		XidStatus
 TransBlockNumberGetXidStatus(Relation relation,
 			   BlockNumber blockNumber, TransactionId xid, bool * failP);
@@ -162,7 +162,7 @@ extern void
 TransBlockNumberSetXidStatus(Relation relation,
 		   BlockNumber blockNumber, TransactionId xid, XidStatus xstatus,
 							 bool * failP);
-extern		AbsoluteTime
+extern AbsoluteTime
 TransBlockNumberGetCommitTime(Relation relation,
 			   BlockNumber blockNumber, TransactionId xid, bool * failP);
 extern void
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index ff77f3fe2c..6de090643c 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -23,7 +23,7 @@ typedef struct attrDefault
 	AttrNumber	adnum;
 	char	   *adbin;
 	char	   *adsrc;
-}			AttrDefault;
+} AttrDefault;
 
 typedef struct constrCheck
 {
@@ -57,7 +57,7 @@ typedef struct tupleDesc
 
 extern TupleDesc CreateTemplateTupleDesc(int natts);
 
-extern TupleDesc CreateTupleDesc(int natts, AttributeTupleForm * attrs);
+extern TupleDesc CreateTupleDesc(int natts, AttributeTupleForm *attrs);
 
 extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc);
 
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index 67b2571c31..9c472284c8 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -37,7 +37,7 @@ extern void
 index_register(char *heap,
 			   char *ind,
 			   int natts,
-			   AttrNumber * attnos,
+			   AttrNumber *attnos,
 			   uint16 nparams,
 			   Datum * params,
 			   FuncIndexInfo * finfo,
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index 7689b7c539..ffb40ea2a8 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -13,9 +13,9 @@
 #ifndef NODEAGG_H
 #define NODEAGG_H
 
-extern TupleTableSlot *ExecAgg(Agg * node);
-extern bool ExecInitAgg(Agg * node, EState * estate, Plan * parent);
-extern int	ExecCountSlotsAgg(Agg * node);
-extern void ExecEndAgg(Agg * node);
+extern TupleTableSlot *ExecAgg(Agg *node);
+extern bool ExecInitAgg(Agg *node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsAgg(Agg *node);
+extern void ExecEndAgg(Agg *node);
 
 #endif							/* NODEAGG_H */
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 70dbefd992..6c6c817eac 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -13,9 +13,9 @@
 #ifndef NODEAPPEND_H
 #define NODEAPPEND_H
 
-extern bool ExecInitAppend(Append * node, EState * estate, Plan * parent);
-extern int	ExecCountSlotsAppend(Append * node);
-extern TupleTableSlot *ExecProcAppend(Append * node);
-extern void ExecEndAppend(Append * node);
+extern bool ExecInitAppend(Append *node, EState * estate, Plan * parent);
+extern int	ExecCountSlotsAppend(Append *node);
+extern TupleTableSlot *ExecProcAppend(Append *node);
+extern void ExecEndAppend(Append *node);
 
 #endif							/* NODEAPPEND_H */
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index b0969f3380..f95bdd2da1 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -111,7 +111,7 @@ typedef struct Port
 
 	/*
 	 * PacketBufId				id;
-	 *//* id of packet buf currently in use */
+*//* id of packet buf currently in use */
 	PacketBuf	buf;			/* stream implementation (curr pack buf) */
 }			Port;
 
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index cabfa0d291..0b2cda508a 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -328,7 +328,7 @@ typedef struct AppendState
 	List	   *as_rtentries;
 	List	   *as_result_relation_info_list;
 	List	   *as_junkFilter_list;
-}			AppendState;
+} AppendState;
 
 /* ----------------------------------------------------------------
  *				 Scan State Information
@@ -574,7 +574,7 @@ typedef struct AggState
 {
 	CommonScanState csstate;	/* its first field is NodeTag */
 	bool		agg_done;
-}			AggState;
+} AggState;
 
 /* ---------------------
  *	GroupState information
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 6e98f75713..bbe11f6502 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -86,7 +86,7 @@ typedef struct AddAttrStmt
 	char	   *relname;		/* the relation to add attr */
 	bool		inh;			/* add recursively to children? */
 	struct ColumnDef *colDef;	/* the attribute definition */
-}			AddAttrStmt;
+} AddAttrStmt;
 
 /* ----------------------
  *		Change ACL Statement
@@ -132,7 +132,7 @@ typedef struct CopyStmt
 typedef enum ArchType
 {
 	ARCH_NONE, ARCH_LIGHT, ARCH_HEAVY	/* archive mode */
-}			ArchType;
+} ArchType;
 
 typedef struct CreateStmt
 {
@@ -562,7 +562,7 @@ typedef struct AppendStmt
 	List	   *targetList;		/* the target list (of ResTarget) */
 	List	   *fromClause;		/* the from clause */
 	Node	   *whereClause;	/* qualifications */
-}			AppendStmt;
+} AppendStmt;
 
 /* ----------------------
  *		Delete Statement
@@ -676,7 +676,7 @@ typedef struct A_Expr
 	char	   *opname;			/* name of operator/function */
 	Node	   *lexpr;			/* left argument */
 	Node	   *rexpr;			/* right argument */
-}			A_Expr;
+} A_Expr;
 
 /*
  * Attr -
@@ -692,7 +692,7 @@ typedef struct Attr
 	List	   *attrs;			/* attributes (possibly nested); list of
 								 * Values (strings) */
 	List	   *indirection;	/* array refs (list of A_Indices') */
-}			Attr;
+} Attr;
 
 /*
  * A_Const - a constant expression
@@ -702,7 +702,7 @@ typedef struct A_Const
 	NodeTag		type;
 	Value		val;			/* the value (with the tag) */
 	TypeName   *typename;		/* typecast */
-}			A_Const;
+} A_Const;
 
 /*
  * ColumnDef - column definition (used in various creates)
@@ -750,7 +750,7 @@ typedef struct A_Indices
 	NodeTag		type;
 	Node	   *lidx;			/* could be NULL */
 	Node	   *uidx;
-}			A_Indices;
+} A_Indices;
 
 /*
  * ResTarget -
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index c6e177c820..834c83edab 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -129,7 +129,7 @@ typedef struct Append
 	Index		unionrelid;
 	List	   *unionrtentries;
 	AppendState *unionstate;
-}			Append;
+} Append;
 
 /*
  * ==========
@@ -223,7 +223,7 @@ typedef struct Agg
 	int			numAgg;
 	Aggreg	  **aggs;
 	AggState   *aggstate;
-}			Agg;
+} Agg;
 
 /* ---------------
  *	 group node -
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index e6ed07c93e..5028d13793 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -267,7 +267,7 @@ typedef struct Aggreg
 	Oid			aggtype;		/* type of final result */
 	Node	   *target;			/* attribute to aggreg on */
 	int			aggno;			/* index to ecxt_values */
-}			Aggreg;
+} Aggreg;
 
 /* ----------------
  * Array
@@ -294,7 +294,7 @@ typedef struct Array
 	IntArray	arraylow;
 	IntArray	arrayhigh;
 	int			arraylen;
-}			Array;
+} Array;
 
 /* ----------------
  *	ArrayRef:
@@ -319,6 +319,6 @@ typedef struct ArrayRef
 	List	   *reflowerindexpr;
 	Node	   *refexpr;
 	Node	   *refassgnexpr;
-}			ArrayRef;
+} ArrayRef;
 
 #endif							/* PRIMNODES_H */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 2ffde38b53..dc23310174 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -44,10 +44,10 @@ extern void fix_opid(Node * clause);
 extern List *fix_opids(List * clauses);
 extern void
 get_relattval(Node * clause, int *relid,
-			  AttrNumber * attno, Datum * constval, int *flag);
+			  AttrNumber *attno, Datum * constval, int *flag);
 extern void
 get_rels_atts(Node * clause, int *relid1,
-			  AttrNumber * attno1, int *relid2, AttrNumber * attno2);
+			  AttrNumber *attno1, int *relid2, AttrNumber *attno2);
 extern void CommuteClause(Node * clause);
 
 #endif							/* CLAUSES_H */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 5843d66b7c..0e8a8a0537 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -32,10 +32,10 @@ make_seqscan(List * qptlist, List * qpqual, Index scanrelid,
 extern Sort *
 make_sort(List * tlist, Oid tempid, Plan * lefttree,
 		  int keycount);
-extern Agg *make_agg(List * tlist, int nagg, Aggreg ** aggs);
+extern Agg *make_agg(List * tlist, int nagg, Aggreg **aggs);
 extern Group *
 make_group(List * tlist, bool tuplePerGroup, int ngrp,
-		   AttrNumber * grpColIdx, Sort * lefttree);
+		   AttrNumber *grpColIdx, Sort * lefttree);
 extern Unique *make_unique(List * tlist, Plan * lefttree, char *uniqueAttr);
 extern List *generate_fjoin(List * tlist);
 
@@ -59,8 +59,8 @@ extern List *
 index_outerjoin_references(List * inner_indxqual,
 						   List * outer_tlist, Index inner_relid);
 extern void set_result_tlist_references(Result * resultNode);
-extern void set_agg_tlist_references(Agg * aggNode);
-extern void set_agg_agglist_references(Agg * aggNode);
+extern void set_agg_tlist_references(Agg *aggNode);
+extern void set_agg_agglist_references(Agg *aggNode);
 
 
 #endif							/* PLANMAIN_H */
diff --git a/src/include/storage/block.h b/src/include/storage/block.h
index 341d87904e..c8b790ff4d 100644
--- a/src/include/storage/block.h
+++ b/src/include/storage/block.h
@@ -51,7 +51,7 @@ typedef struct BlockIdData
 {
 	uint16		bi_hi;
 	uint16		bi_lo;
-}			BlockIdData;
+} BlockIdData;
 
 typedef BlockIdData *BlockId;	/* block identifier */
 
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index b45a280aa3..ac7dec58b6 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -203,18 +203,18 @@ typedef struct _bmtrace
 /* Internal routines: only called by buf.c */
 
 /*freelist.c*/
-extern void AddBufferToFreelist(BufferDesc * bf);
-extern void PinBuffer(BufferDesc * buf);
-extern void PinBuffer_Debug(char *file, int line, BufferDesc * buf);
-extern void UnpinBuffer(BufferDesc * buf);
+extern void AddBufferToFreelist(BufferDesc *bf);
+extern void PinBuffer(BufferDesc *buf);
+extern void PinBuffer_Debug(char *file, int line, BufferDesc *buf);
+extern void UnpinBuffer(BufferDesc *buf);
 extern BufferDesc *GetFreeBuffer(void);
 extern void InitFreeList(bool init);
 
 /* buf_table.c */
 extern void InitBufTable(void);
 extern BufferDesc *BufTableLookup(BufferTag * tagPtr);
-extern bool BufTableDelete(BufferDesc * buf);
-extern bool BufTableInsert(BufferDesc * buf);
+extern bool BufTableDelete(BufferDesc *buf);
+extern bool BufTableInsert(BufferDesc *buf);
 
 /* bufmgr.c */
 extern BufferDesc *BufferDescriptors;
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index b8d91c19af..2b78dc8e36 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -71,13 +71,13 @@ extern int	ShowPinTrace;
 /*
  * prototypes for functions in bufmgr.c
  */
-extern		Buffer
+extern Buffer
 RelationGetBufferWithBuffer(Relation relation,
 							BlockNumber blockNumber, Buffer buffer);
 extern Buffer ReadBuffer(Relation reln, BlockNumber blockNum);
 extern int	WriteBuffer(Buffer buffer);
 extern int	WriteNoReleaseBuffer(Buffer buffer);
-extern		Buffer
+extern Buffer
 ReleaseAndReadBuffer(Buffer buffer, Relation relation,
 					 BlockNumber blockNum);
 
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 2b3e292d5e..47cc25aca1 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -91,7 +91,7 @@ typedef struct
 	char		key[BTABLE_KEYSIZE];	/* string name */
 	unsigned long location;		/* location in shared mem */
 	unsigned long size;			/* numbytes allocated for the structure */
-}			BindingEnt;
+} BindingEnt;
 
 /*
  * prototypes for functions in shmqueue.c
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index f430c46ed5..f99f4d12dc 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -74,7 +74,7 @@ typedef struct AclItem
 	AclId		ai_id;
 	AclIdType	ai_idtype;
 	AclMode		ai_mode;
-}			AclItem;
+} AclItem;
 
 /* Note: if the size of AclItem changes,
    change the aclitem typlen in pg_type.h */
@@ -137,7 +137,7 @@ extern char *aclcheck_error_strings[];
  */
 extern Acl *aclownerdefault(AclId ownerid);
 extern Acl *acldefault(void);
-extern Acl *aclinsert3(Acl * old_acl, AclItem * mod_aip, unsigned modechg);
+extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg);
 
 extern char *aclmakepriv(char *old_privlist, char new_priv);
 extern char *aclmakeuser(char *user_type, char *user);
@@ -150,15 +150,15 @@ makeAclStmt(char *privs, List * rel_list, char *grantee,
  */
 extern Acl *makeacl(int n);
 extern AclItem *aclitemin(char *s);
-extern char *aclitemout(AclItem * aip);
-extern Acl *aclinsert(Acl * old_acl, AclItem * mod_aip);
-extern Acl *aclremove(Acl * old_acl, AclItem * mod_aip);
-extern int32 aclcontains(Acl * acl, AclItem * aip);
+extern char *aclitemout(AclItem *aip);
+extern Acl *aclinsert(Acl *old_acl, AclItem *mod_aip);
+extern Acl *aclremove(Acl *old_acl, AclItem *mod_aip);
+extern int32 aclcontains(Acl *acl, AclItem *aip);
 
 /*
  * prototypes for functions in aclchk.c
  */
-extern void ChangeAcl(char *relname, AclItem * mod_aip, unsigned modechg);
+extern void ChangeAcl(char *relname, AclItem *mod_aip, unsigned modechg);
 extern AclId get_grosysid(char *groname);
 extern char *get_groname(AclId grosysid);
 
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index bc991f3aee..8e5a64fa2c 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -29,7 +29,7 @@ typedef struct
 	int			size;			/* total array size (in bytes) */
 	int			ndim;			/* # of dimensions */
 	int			flags;			/* implementation flags */
-}			ArrayType;
+} ArrayType;
 
 /*
  * bitmask of ArrayType flags field:
@@ -115,22 +115,22 @@ typedef struct
  * prototypes for functions defined in arrayfuncs.c
  */
 extern char *array_in(char *string, Oid element_type);
-extern char *array_out(ArrayType * v, Oid element_type);
-extern char *array_dims(ArrayType * v, bool * isNull);
+extern char *array_out(ArrayType *v, Oid element_type);
+extern char *array_dims(ArrayType *v, bool * isNull);
 extern		Datum
-array_ref(ArrayType * array, int n, int indx[], int reftype,
+array_ref(ArrayType *array, int n, int indx[], int reftype,
 		  int elmlen, int arraylen, bool * isNull);
 extern		Datum
-array_clip(ArrayType * array, int n, int upperIndx[],
+array_clip(ArrayType *array, int n, int upperIndx[],
 		   int lowerIndx[], int reftype, int len, bool * isNull);
 extern char *
-array_set(ArrayType * array, int n, int indx[], char *dataPtr,
+array_set(ArrayType *array, int n, int indx[], char *dataPtr,
 		  int reftype, int elmlen, int arraylen, bool * isNull);
 extern char *
-array_assgn(ArrayType * array, int n, int upperIndx[],
-			int lowerIndx[], ArrayType * newArr, int reftype,
+array_assgn(ArrayType *array, int n, int upperIndx[],
+			int lowerIndx[], ArrayType *newArr, int reftype,
 			int len, bool * isNull);
-extern int	array_eq(ArrayType * array1, ArrayType * array2);
+extern int	array_eq(ArrayType *array1, ArrayType *array2);
 extern int
 _LOtransfer(char **destfd, int size, int nitems, char **srcfd,
 			int isSrcLO, int isDestLO);
@@ -161,10 +161,10 @@ _ChunkArray(int fd, FILE * afd, int ndim, int dim[], int baseSize,
 			int *nbytes, char *chunkfile);
 extern int
 _ReadChunkArray(int st[], int endp[], int bsize, int fp,
-		   char *destfp, ArrayType * array, int isDestLO, bool * isNull);
+			char *destfp, ArrayType *array, int isDestLO, bool * isNull);
 extern struct varlena *
 _ReadChunkArray1El(int st[], int bsize, int fp,
-				   ArrayType * array, bool * isNull);
+				   ArrayType *array, bool * isNull);
 
 
 #endif							/* ARRAY_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index a04f1f18d4..a80af99f23 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -199,10 +199,10 @@ extern int32 btnamecmp(NameData * a, NameData * b);
 extern int32 bttextcmp(struct varlena * a, struct varlena * b);
 
 /* support routines for the rtree access method, by opclass */
-extern BOX *rt_box_union(BOX * a, BOX * b);
-extern BOX *rt_box_inter(BOX * a, BOX * b);
-extern void rt_box_size(BOX * a, float *size);
-extern void rt_bigbox_size(BOX * a, float *size);
+extern BOX *rt_box_union(BOX *a, BOX *b);
+extern BOX *rt_box_inter(BOX *a, BOX *b);
+extern void rt_box_size(BOX *a, float *size);
+extern void rt_bigbox_size(BOX *a, float *size);
 extern void rt_poly_size(POLYGON * a, float *size);
 extern POLYGON *rt_poly_union(POLYGON * a, POLYGON * b);
 extern POLYGON *rt_poly_inter(POLYGON * a, POLYGON * b);
@@ -338,7 +338,7 @@ extern bool float84gt(float64 arg1, float32 arg2);
 extern bool float84ge(float64 arg1, float32 arg2);
 
 /* geo_ops.c, geo_selfuncs.c */
-extern double *box_area(BOX * box);
+extern double *box_area(BOX *box);
 
 /* misc.c */
 extern bool nullvalue(Datum value, bool * isNull);
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index 5de970bfc0..48ec79f652 100644
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -120,7 +120,7 @@ typedef struct
 {
 	Point		high,
 				low;			/* corner POINTs */
-}			BOX;
+} BOX;
 
 /*---------------------------------------------------------------------
  * POLYGON - Specified by an array of doubles defining the points,
@@ -187,65 +187,65 @@ extern Point *lseg_interpt(LSEG * l1, LSEG * l2);
 extern double *dist_pl(Point * pt, LINE * line);
 extern double *dist_ps(Point * pt, LSEG * lseg);
 extern double *dist_ppath(Point * pt, PATH * path);
-extern double *dist_pb(Point * pt, BOX * box);
+extern double *dist_pb(Point * pt, BOX *box);
 extern double *dist_sl(LSEG * lseg, LINE * line);
-extern double *dist_sb(LSEG * lseg, BOX * box);
-extern double *dist_lb(LINE * line, BOX * box);
+extern double *dist_sb(LSEG * lseg, BOX *box);
+extern double *dist_lb(LINE * line, BOX *box);
 extern Point *close_pl(Point * pt, LINE * line);
 extern Point *close_ps(Point * pt, LSEG * lseg);
-extern Point *close_pb(Point * pt, BOX * box);
+extern Point *close_pb(Point * pt, BOX *box);
 extern Point *close_sl(LSEG * lseg, LINE * line);
-extern Point *close_sb(LSEG * lseg, BOX * box);
-extern Point *close_lb(LINE * line, BOX * box);
+extern Point *close_sb(LSEG * lseg, BOX *box);
+extern Point *close_lb(LINE * line, BOX *box);
 extern bool on_pl(Point * pt, LINE * line);
 extern bool on_ps(Point * pt, LSEG * lseg);
-extern bool on_pb(Point * pt, BOX * box);
+extern bool on_pb(Point * pt, BOX *box);
 extern bool on_ppath(Point * pt, PATH * path);
 extern bool on_sl(LSEG * lseg, LINE * line);
-extern bool on_sb(LSEG * lseg, BOX * box);
+extern bool on_sb(LSEG * lseg, BOX *box);
 extern bool inter_sl(LSEG * lseg, LINE * line);
-extern bool inter_sb(LSEG * lseg, BOX * box);
-extern bool inter_lb(LINE * line, BOX * box);
+extern bool inter_sb(LSEG * lseg, BOX *box);
+extern bool inter_lb(LINE * line, BOX *box);
 
 /* private routines */
 extern LSEG *lseg_construct(Point * pt1, Point * pt2);
 
 /* public box routines */
 extern BOX *box_in(char *str);
-extern char *box_out(BOX * box);
-extern bool box_same(BOX * box1, BOX * box2);
-extern bool box_overlap(BOX * box1, BOX * box2);
-extern bool box_overleft(BOX * box1, BOX * box2);
-extern bool box_left(BOX * box1, BOX * box2);
-extern bool box_right(BOX * box1, BOX * box2);
-extern bool box_overright(BOX * box1, BOX * box2);
-extern bool box_contained(BOX * box1, BOX * box2);
-extern bool box_contain(BOX * box1, BOX * box2);
-extern bool box_below(BOX * box1, BOX * box2);
-extern bool box_above(BOX * box1, BOX * box2);
-extern bool box_lt(BOX * box1, BOX * box2);
-extern bool box_gt(BOX * box1, BOX * box2);
-extern bool box_eq(BOX * box1, BOX * box2);
-extern bool box_le(BOX * box1, BOX * box2);
-extern bool box_ge(BOX * box1, BOX * box2);
-extern Point *box_center(BOX * box);
-extern double *box_area(BOX * box);
-extern double *box_width(BOX * box);
-extern double *box_height(BOX * box);
-extern double *box_distance(BOX * box1, BOX * box2);
-extern Point *box_center(BOX * box);
-extern BOX *box_intersect(BOX * box1, BOX * box2);
-extern LSEG *box_diagonal(BOX * box);
+extern char *box_out(BOX *box);
+extern bool box_same(BOX *box1, BOX *box2);
+extern bool box_overlap(BOX *box1, BOX *box2);
+extern bool box_overleft(BOX *box1, BOX *box2);
+extern bool box_left(BOX *box1, BOX *box2);
+extern bool box_right(BOX *box1, BOX *box2);
+extern bool box_overright(BOX *box1, BOX *box2);
+extern bool box_contained(BOX *box1, BOX *box2);
+extern bool box_contain(BOX *box1, BOX *box2);
+extern bool box_below(BOX *box1, BOX *box2);
+extern bool box_above(BOX *box1, BOX *box2);
+extern bool box_lt(BOX *box1, BOX *box2);
+extern bool box_gt(BOX *box1, BOX *box2);
+extern bool box_eq(BOX *box1, BOX *box2);
+extern bool box_le(BOX *box1, BOX *box2);
+extern bool box_ge(BOX *box1, BOX *box2);
+extern Point *box_center(BOX *box);
+extern double *box_area(BOX *box);
+extern double *box_width(BOX *box);
+extern double *box_height(BOX *box);
+extern double *box_distance(BOX *box1, BOX *box2);
+extern Point *box_center(BOX *box);
+extern BOX *box_intersect(BOX *box1, BOX *box2);
+extern LSEG *box_diagonal(BOX *box);
 
 /* private routines */
 
-extern double box_dt(BOX * box1, BOX * box2);
+extern double box_dt(BOX *box1, BOX *box2);
 
 extern BOX *box(Point * p1, Point * p2);
-extern BOX *box_add(BOX * box, Point * p);
-extern BOX *box_sub(BOX * box, Point * p);
-extern BOX *box_mul(BOX * box, Point * p);
-extern BOX *box_div(BOX * box, Point * p);
+extern BOX *box_add(BOX *box, Point * p);
+extern BOX *box_sub(BOX *box, Point * p);
+extern BOX *box_mul(BOX *box, Point * p);
+extern BOX *box_div(BOX *box, Point * p);
 
 /* private line routines */
 extern double *line_distance(LINE * l1, LINE * l2);
@@ -301,7 +301,7 @@ extern int4 poly_npoints(POLYGON * poly);
 extern Point *poly_center(POLYGON * poly);
 extern BOX *poly_box(POLYGON * poly);
 extern PATH *poly_path(POLYGON * poly);
-extern POLYGON *box_poly(BOX * box);
+extern POLYGON *box_poly(BOX *box);
 
 extern POLYGON *upgradepoly(POLYGON * poly);
 extern POLYGON *revertpoly(POLYGON * poly);
@@ -341,7 +341,7 @@ extern double *dist_pc(Point * point, CIRCLE * circle);
 extern double *dist_cpoly(CIRCLE * circle, POLYGON * poly);
 extern Point *circle_center(CIRCLE * circle);
 extern CIRCLE *circle(Point * center, float8 * radius);
-extern CIRCLE *box_circle(BOX * box);
+extern CIRCLE *box_circle(BOX *box);
 extern BOX *circle_box(CIRCLE * circle);
 extern CIRCLE *poly_circle(POLYGON * poly);
 extern POLYGON *circle_poly(int npts, CIRCLE * circle);
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 64d05b9b11..bd6b95a3a7 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -193,7 +193,7 @@ typedef enum AllocMode
 	StaticAllocMode,			/* always "statically" allocate */
 	TunableAllocMode,			/* allocations are "tuned" */
 	BoundedAllocMode			/* allocations bounded to fixed usage */
-}			AllocMode;
+} AllocMode;
 
 #define DefaultAllocMode		DynamicAllocMode
 
@@ -205,7 +205,7 @@ typedef struct AllocSetData
 {
 	OrderedSetData setData;
 	/* Note: this will change in the future to support other modes */
-}			AllocSetData;
+} AllocSetData;
 
 typedef AllocSetData *AllocSet;
 
@@ -228,7 +228,7 @@ extern void AllocSetReset(AllocSet set);
 extern bool AllocSetContains(AllocSet set, AllocPointer pointer);
 extern AllocPointer AllocSetAlloc(AllocSet set, Size size);
 extern void AllocSetFree(AllocSet set, AllocPointer pointer);
-extern		AllocPointer
+extern AllocPointer
 AllocSetRealloc(AllocSet set, AllocPointer pointer,
 				Size size);