OK, folks, here is the pgindent output.

24 files changed, 81 insertions, 106 deletions

diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h
index 3ecb90810b0..36f434804f7 100644
--- a/src/include/executor/execFlatten.h
+++ b/src/include/executor/execFlatten.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execFlatten.h,v 1.6 1997/11/26 01:12:36 momjian Exp $
+ * $Id: execFlatten.h,v 1.7 1998/09/01 04:35:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,4 +22,4 @@ extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsN
 extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, bool *fj_isDone);
 
 
-#endif							/* EXECFLATTEN_H */
+#endif	 /* EXECFLATTEN_H */
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index d9a746a7255..40ffd4a1d4f 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.5 1998/06/15 18:39:55 momjian Exp $
+ * $Id: execdebug.h,v 1.6 1998/09/01 04:35:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -202,7 +202,7 @@ extern int	NIndexTupleInserted;
 #define IncrProcessed()			(void)(0)
 #define IncrIndexProcessed()	(void)(0)
 #define IncrIndexInserted()		(void)(0)
-#endif							/* EXEC_TUPLECOUNT */
+#endif	 /* EXEC_TUPLECOUNT */
 
 /* ----------------
  *		memory context debugging defines
@@ -214,7 +214,7 @@ extern int	NIndexTupleInserted;
 #else
 #define CXT_printf(s)
 #define CXT1_printf(s, a)
-#endif							/* EXEC_CONTEXTDEBUG */
+#endif	 /* EXEC_CONTEXTDEBUG */
 
 /* ----------------
  *		eutils debugging defines
@@ -234,7 +234,7 @@ extern int	NIndexTupleInserted;
 #define EU2_printf(s, a, b)
 #define EU3_printf(s, a, b, c)
 #define EU4_printf(s, a, b, c, d)
-#endif							/* EXEC_UTILSDEBUG */
+#endif	 /* EXEC_UTILSDEBUG */
 
 
 /* ----------------
@@ -253,7 +253,7 @@ extern int	NIndexTupleInserted;
 #define NL1_printf(s, a)
 #define NL4_printf(s, a, b, c, d)
 #define ENL1_printf(message)
-#endif							/* EXEC_NESTLOOPDEBUG */
+#endif	 /* EXEC_NESTLOOPDEBUG */
 
 /* ----------------
  *		proc node debugging defines
@@ -265,7 +265,7 @@ extern int	NIndexTupleInserted;
 #else
 #define PN_printf(s)
 #define PN1_printf(s, p)
-#endif							/* EXEC_PROCDEBUG */
+#endif	 /* EXEC_PROCDEBUG */
 
 /* ----------------
  *		exec eval / target list debugging defines
@@ -281,7 +281,7 @@ extern int	NIndexTupleInserted;
 #define EV_printf(s)
 #define EV1_printf(s, a)
 #define EV5_printf(s, a, b, c, d, e)
-#endif							/* EXEC_EVALDEBUG */
+#endif	 /* EXEC_EVALDEBUG */
 
 /* ----------------
  *		scan debugging defines
@@ -295,7 +295,7 @@ extern int	NIndexTupleInserted;
 #define S_nodeDisplay(l)
 #define S_printf(s)
 #define S1_printf(s, p)
-#endif							/* EXEC_SCANDEBUG */
+#endif	 /* EXEC_SCANDEBUG */
 
 /* ----------------
  *		sort node debugging defines
@@ -309,7 +309,7 @@ extern int	NIndexTupleInserted;
 #define SO_nodeDisplay(l)
 #define SO_printf(s)
 #define SO1_printf(s, p)
-#endif							/* EXEC_SORTDEBUG */
+#endif	 /* EXEC_SORTDEBUG */
 
 /* ----------------
  *		merge join debugging defines
@@ -343,7 +343,7 @@ extern int	NIndexTupleInserted;
 #define MJ_DEBUG_QUAL(clause, res)
 #define MJ_DEBUG_MERGE_COMPARE(qual, res)
 #define MJ_DEBUG_PROC_NODE(slot)
-#endif							/* EXEC_MERGEJOINDEBUG */
+#endif	 /* EXEC_MERGEJOINDEBUG */
 
 /* ----------------------------------------------------------------
  *		DO NOT DEFINE THESE EVER OR YOU WILL BURN!
@@ -381,4 +381,4 @@ extern int	NIndexTupleInserted;
 extern long NDirectFileRead;
 extern long NDirectFileWrite;
 
-#endif							/* ExecDebugIncluded */
+#endif	 /* ExecDebugIncluded */
diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h
index 59748cfe9be..330801e2f9a 100644
--- a/src/include/executor/execdefs.h
+++ b/src/include/executor/execdefs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdefs.h,v 1.2 1997/09/07 04:57:46 momjian Exp $
+ * $Id: execdefs.h,v 1.3 1998/09/01 04:35:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,4 +44,4 @@
 #define EXEC_MJ_SKIPINNER				8
 #define EXEC_MJ_SKIPOUTER				9
 
-#endif							/* EXECDEFS_H */
+#endif	 /* EXECDEFS_H */
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index b7d71250ea0..258ff39fae8 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.8 1998/02/26 04:41:17 momjian Exp $
+ * $Id: execdesc.h,v 1.9 1998/09/01 04:35:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,8 +33,7 @@ typedef struct QueryDesc
 } QueryDesc;
 
 /* in pquery.c */
-extern QueryDesc *
-CreateQueryDesc(Query *parsetree, Plan *plantree,
+extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree,
 				CommandDest dest);
 
-#endif							/* EXECDESC_H  */
+#endif	 /* EXECDESC_H	*/
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index fea963fc110..cf218dcd7fd 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.24 1998/09/01 03:28:06 momjian Exp $
+ * $Id: executor.h,v 1.25 1998/09/01 04:35:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -59,14 +59,12 @@
 /*
  * prototypes from functions in execAmi.c
  */
-extern void
-ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
-			  ScanDirection dir, Snapshot snapshot, 
+extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
+			  ScanDirection dir, Snapshot snapshot,
 			  Relation *returnRelation, Pointer *returnScanDesc);
 extern void ExecCloseR(Plan *node);
 extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent);
-extern HeapScanDesc
-ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
+extern HeapScanDesc ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
 			ScanDirection direction, int nkeys, ScanKey skeys);
 extern void ExecMarkPos(Plan *node);
 extern void ExecRestrPos(Plan *node);
@@ -76,8 +74,7 @@ extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid);
  * prototypes from functions in execJunk.c
  */
 extern JunkFilter *ExecInitJunkFilter(List *targetList);
-extern bool
-ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot,
+extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot,
 					 char *attrName, Datum *value, bool *isNull);
 extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot);
 
@@ -104,20 +101,16 @@ extern void ExecEndNode(Plan *node, Plan *parent);
 extern bool execConstByVal;
 extern int	execConstLen;
 
-extern Datum
-ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum,
+extern Datum ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum,
 				  bool *isNull);
-extern Datum
-ExecEvalParam(Param *expression, ExprContext *econtext,
+extern Datum ExecEvalParam(Param *expression, ExprContext *econtext,
 			  bool *isNull);
 
 /* stop here */
-extern char *
-GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno,
+extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno,
 				  bool *isNull);
 extern char *GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull);
-extern Datum
-ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull,
+extern Datum ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull,
 			 bool *isDone);
 extern bool ExecQual(List *qual, ExprContext *econtext);
 extern int	ExecTargetListLength(List *targetlist);
@@ -134,20 +127,17 @@ extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ());
 extern TupleTable ExecCreateTupleTable(int initialSize);
 extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree);
 extern TupleTableSlot *ExecAllocTableSlot(TupleTable table);
-extern TupleTableSlot *
-ExecStoreTuple(HeapTuple tuple,
+extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple,
 			   TupleTableSlot *slot,
 			   Buffer buffer,
 			   bool shouldFree);
 extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot);
 extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree);
-extern TupleDesc
-ExecSetSlotDescriptor(TupleTableSlot *slot,
+extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot,
 					  TupleDesc tupdesc);
 extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew);
 extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate);
-extern void
-ExecInitScanTupleSlot(EState *estate,
+extern void ExecInitScanTupleSlot(EState *estate,
 					  CommonScanState *commonscanstate);
 extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate);
 extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
@@ -160,35 +150,28 @@ extern void SetChangedParamList(Plan *node, List *newchg);
  * prototypes from functions in execTuples.c
  */
 extern void ResetTupleCount(void);
-extern void
-ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode,
+extern void ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode,
 					   Plan *parent);
 extern void ExecAssignExprContext(EState *estate, CommonState *commonstate);
-extern void
-ExecAssignResultType(CommonState *commonstate,
+extern void ExecAssignResultType(CommonState *commonstate,
 					 TupleDesc tupDesc);
-extern void
-ExecAssignResultTypeFromOuterPlan(Plan *node,
+extern void ExecAssignResultTypeFromOuterPlan(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 TupleDesc ExecGetScanType(CommonScanState *csstate);
-extern void
-ExecAssignScanType(CommonScanState *csstate,
+extern void ExecAssignScanType(CommonScanState *csstate,
 				   TupleDesc tupDesc);
-extern void
-ExecAssignScanTypeFromOuterPlan(Plan *node,
+extern void ExecAssignScanTypeFromOuterPlan(Plan *node,
 								CommonScanState *csstate);
 extern Form_pg_attribute ExecGetTypeInfo(Relation relDesc);
 
-extern void
-ExecOpenIndices(Oid resultRelationOid,
+extern void ExecOpenIndices(Oid resultRelationOid,
 				RelationInfo *resultRelationInfo);
 extern void ExecCloseIndices(RelationInfo *resultRelationInfo);
-extern void
-ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid,
+extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid,
 					  EState *estate, bool is_update);
 
-#endif							/* EXECUTOR_H  */
+#endif	 /* EXECUTOR_H	*/
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 209d4b34e9d..c521b9efd61 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: functions.h,v 1.7 1998/02/26 04:41:20 momjian Exp $
+ * $Id: functions.h,v 1.8 1998/09/01 04:35:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,12 +18,10 @@
 #include "nodes/primnodes.h"
 #include "utils/syscache.h"
 
-extern Datum
-ProjectAttribute(TupleDesc TD, TargetEntry *tlist,
+extern Datum ProjectAttribute(TupleDesc TD, TargetEntry *tlist,
 				 HeapTuple tup, bool *isnullP);
 
-extern Datum
-postquel_function(Func *funcNode, char **args,
+extern Datum postquel_function(Func *funcNode, char **args,
 				  bool *isNull, bool *isDone);
 
-#endif							/* FUNCTIONS_H */
+#endif	 /* FUNCTIONS_H */
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index e6f0766b720..3dceec85f34 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.6 1997/09/08 21:52:00 momjian Exp $
+ * $Id: hashjoin.h,v 1.7 1998/09/01 04:35:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,4 +81,4 @@ typedef HashBucketData *HashBucket;
 
 #define HASH_PERMISSION			0700
 
-#endif							/* HASHJOIN_H */
+#endif	 /* HASHJOIN_H */
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index ca8de787d17..7c3ee010e87 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.7 1998/02/13 03:43:34 vadim Exp $
+ * $Id: nodeAgg.h,v 1.8 1998/09/01 04:35:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,4 @@ extern int	ExecCountSlotsAgg(Agg *node);
 extern void ExecEndAgg(Agg *node);
 extern void ExecReScanAgg(Agg *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODEAGG_H */
+#endif	 /* NODEAGG_H */
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 2825cf573f4..10549fbaca8 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAppend.h,v 1.8 1998/07/15 22:16:21 momjian Exp $
+ * $Id: nodeAppend.h,v 1.9 1998/09/01 04:35:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,4 @@ extern TupleTableSlot *ExecProcAppend(Append *node);
 extern void ExecEndAppend(Append *node);
 extern void ExecReScanAppend(Append *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODEAPPEND_H */
+#endif	 /* NODEAPPEND_H */
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index 4449a09b4ac..0c23aa02d33 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.6 1998/07/16 01:49:19 momjian Exp $
+ * $Id: nodeGroup.h,v 1.7 1998/09/01 04:35:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,4 @@ extern int	ExecCountSlotsGroup(Group *node);
 extern void ExecEndGroup(Group *node);
 extern void ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODEGROUP_H */
+#endif	 /* NODEGROUP_H */
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 720fcf80678..27ae5f80d3f 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.9 1998/02/26 04:41:21 momjian Exp $
+ * $Id: nodeHash.h,v 1.10 1998/09/01 04:35:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,18 +26,15 @@ 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,
+extern void ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext,
 					Var *hashkey, File *batches);
 extern void ExecHashTableDestroy(HashJoinTable hashtable);
-extern int
-ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext,
+extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext,
 				  Var *hashkey);
-extern HeapTuple
-ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket,
+extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket,
 				   HeapTuple curtuple, List *hjclauses,
 				   ExprContext *econtext);
 extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples);
 extern void ExecReScanHash(Hash *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODEHASH_H */
+#endif	 /* NODEHASH_H */
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 08827cec072..8699e593362 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.9 1998/02/26 04:41:23 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.10 1998/09/01 04:35:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,10 +21,9 @@ extern TupleTableSlot *ExecHashJoin(HashJoin *node);
 extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsHashJoin(HashJoin *node);
 extern void ExecEndHashJoin(HashJoin *node);
-extern char *
-ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer,
+extern char *ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer,
 					  File file, char *position);
 extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent);
 
 
-#endif							/* NODEHASHJOIN_H */
+#endif	 /* NODEHASHJOIN_H */
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index 1e13cc9666b..2990e75b480 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.6 1997/11/26 01:12:52 momjian Exp $
+ * $Id: nodeIndexscan.h,v 1.7 1998/09/01 04:35:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,4 +27,4 @@ extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsIndexScan(IndexScan *node);
 extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODEINDEXSCAN_H */
+#endif	 /* NODEINDEXSCAN_H */
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index c52e06ec98f..dbd755bae8c 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.7 1998/02/26 04:41:24 momjian Exp $
+ * $Id: nodeMaterial.h,v 1.8 1998/09/01 04:36:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,4 +28,4 @@ extern List ExecMaterialMarkPos(Material *node);
 extern void ExecMaterialRestrPos(Material *node);
 
 #endif
-#endif							/* NODEMATERIAL_H */
+#endif	 /* NODEMATERIAL_H */
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index e3d1b15500d..1095315978c 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.8 1998/02/27 16:12:09 vadim Exp $
+ * $Id: nodeMergejoin.h,v 1.9 1998/09/01 04:36:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,4 @@ extern int	ExecCountSlotsMergeJoin(MergeJoin *node);
 extern void ExecEndMergeJoin(MergeJoin *node);
 extern void ExecReScanMergeJoin(MergeJoin *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODEMERGEJOIN_H; */
+#endif	 /* NODEMERGEJOIN_H; */
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index 50d2f49820f..2c79b4d62a2 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.6 1998/02/13 03:43:38 vadim Exp $
+ * $Id: nodeNestloop.h,v 1.7 1998/09/01 04:36:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,4 @@ extern int	ExecCountSlotsNestLoop(NestLoop *node);
 extern void ExecEndNestLoop(NestLoop *node);
 extern void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODENESTLOOP_H */
+#endif	 /* NODENESTLOOP_H */
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index fffdf52e6ab..f966ab0dc90 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.6 1998/02/13 03:43:39 vadim Exp $
+ * $Id: nodeResult.h,v 1.7 1998/09/01 04:36:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,4 @@ extern int	ExecCountSlotsResult(Result *node);
 extern void ExecEndResult(Result *node);
 extern void ExecReScanResult(Result *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODERESULT_H */
+#endif	 /* NODERESULT_H */
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index 2c980d8eaad..1064b02b97a 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.6 1997/11/26 01:13:00 momjian Exp $
+ * $Id: nodeSeqscan.h,v 1.7 1998/09/01 04:36:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,4 +25,4 @@ extern void ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent);
 extern void ExecSeqMarkPos(SeqScan *node);
 extern void ExecSeqRestrPos(SeqScan *node);
 
-#endif							/* NODESEQSCAN_H */
+#endif	 /* NODESEQSCAN_H */
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index 89beeb8c721..5d405fcc003 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.6 1998/02/23 06:27:55 vadim Exp $
+ * $Id: nodeSort.h,v 1.7 1998/09/01 04:36:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,4 +25,4 @@ extern void ExecSortMarkPos(Sort *node);
 extern void ExecSortRestrPos(Sort *node);
 extern void ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODESORT_H */
+#endif	 /* NODESORT_H */
diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h
index dc25902a793..a28cd2c4852 100644
--- a/src/include/executor/nodeSubplan.h
+++ b/src/include/executor/nodeSubplan.h
@@ -17,4 +17,4 @@ extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent);
 extern void ExecSetParamPlan(SubPlan *node);
 extern void ExecEndSubPlan(SubPlan *node);
 
-#endif							/* NODESUBPLAN_H */
+#endif	 /* NODESUBPLAN_H */
diff --git a/src/include/executor/nodeTee.h b/src/include/executor/nodeTee.h
index d58b0b1cf6d..349c091e6a4 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.5 1997/11/26 01:13:06 momjian Exp $
+ * $Id: nodeTee.h,v 1.6 1998/09/01 04:36:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,4 @@ extern void ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent);
 extern void ExecEndTee(Tee *node, Plan *parent);
 extern int	ExecCountSlotsTee(Tee *node);
 
-#endif							/* NODETEE_H */
+#endif	 /* NODETEE_H */
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index ba4112cb8de..f414b7b6598 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.6 1998/02/23 06:27:56 vadim Exp $
+ * $Id: nodeUnique.h,v 1.7 1998/09/01 04:36:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,4 @@ extern int	ExecCountSlotsUnique(Unique *node);
 extern void ExecEndUnique(Unique *node);
 extern void ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent);
 
-#endif							/* NODEUNIQUE_H */
+#endif	 /* NODEUNIQUE_H */
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index d5479007087..72b6fe0f1fa 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -78,8 +78,7 @@ extern void *SPI_prepare(char *src, int nargs, Oid *argtypes);
 extern void *SPI_saveplan(void *plan);
 
 extern HeapTuple SPI_copytuple(HeapTuple tuple);
-extern HeapTuple
-SPI_modifytuple(Relation rel, HeapTuple tuple, int natts,
+extern HeapTuple SPI_modifytuple(Relation rel, HeapTuple tuple, int natts,
 				int *attnum, Datum *Values, char *Nulls);
 extern int	SPI_fnumber(TupleDesc tupdesc, char *fname);
 extern char *SPI_fname(TupleDesc tupdesc, int fnumber);
@@ -92,4 +91,4 @@ extern void *SPI_palloc(Size size);
 extern void *SPI_repalloc(void *pointer, Size size);
 extern void SPI_pfree(void *pointer);
 
-#endif							/* SPI_H */
+#endif	 /* SPI_H */
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index 1df589265e2..e0ab50b5f38 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.7 1997/09/08 21:52:16 momjian Exp $
+ * $Id: tuptable.h,v 1.8 1998/09/01 04:36:13 momjian Exp $
  *
  * NOTES
  *	  The tuple table interface is getting pretty ugly.
@@ -75,4 +75,4 @@ typedef TupleTableData *TupleTable;
   - jolly
 */
 
-#endif							/* TUPTABLE_H */
+#endif	 /* TUPTABLE_H */