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

22 files changed, 192 insertions, 192 deletions

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;