Re-run pgindent with updated list of typedefs. (Updated README should

avoid this problem in the future.)

39 files changed, 187 insertions, 187 deletions

diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 84b6080c720..f49134c6c6e 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.96 2007/11/15 21:14:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.97 2007/11/15 22:25:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -714,7 +714,7 @@ typedef struct xl_heap_freeze
 	BlockNumber block;
 	TransactionId cutoff_xid;
 	/* TUPLE OFFSET NUMBERS FOLLOW AT THE END */
-}	xl_heap_freeze;
+} xl_heap_freeze;
 
 #define SizeOfHeapFreeze (offsetof(xl_heap_freeze, cutoff_xid) + sizeof(TransactionId))
 
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index de6f53e0533..14f2c55e4dd 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.85 2007/11/15 21:14:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.86 2007/11/15 22:25:17 momjian Exp $
  */
 #ifndef XLOG_H
 #define XLOG_H
@@ -182,7 +182,7 @@ typedef struct CheckpointStatsData
 	int			ckpt_segs_added;	/* # of new xlog segments created */
 	int			ckpt_segs_removed;		/* # of xlog segments deleted */
 	int			ckpt_segs_recycled;		/* # of xlog segments recycled */
-}	CheckpointStatsData;
+} CheckpointStatsData;
 
 extern CheckpointStatsData CheckpointStats;
 
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index 5f2399ae597..ac53fedd486 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.48 2007/11/15 21:14:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.49 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -71,6 +71,6 @@ typedef enum
 	StartupProcess,
 	BgWriterProcess,
 	WalWriterProcess
-}	AuxProcType;
+} AuxProcType;
 
 #endif   /* BOOTSTRAP_H */
diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h
index 8da3c9968e8..c2c3f7512a4 100644
--- a/src/include/catalog/namespace.h
+++ b/src/include/catalog/namespace.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.50 2007/11/15 21:14:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.51 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,7 +40,7 @@ typedef struct OverrideSearchPath
 	List	   *schemas;		/* OIDs of explicitly named schemas */
 	bool		addCatalog;		/* implicitly prepend pg_catalog? */
 	bool		addTemp;		/* implicitly prepend temp schema? */
-}	OverrideSearchPath;
+} OverrideSearchPath;
 
 
 extern Oid	RangeVarGetRelid(const RangeVar *relation, bool failOK);
@@ -99,7 +99,7 @@ extern Oid	GetTempToastNamespace(void);
 extern void ResetTempTableNamespace(void);
 
 extern OverrideSearchPath *GetOverrideSearchPath(MemoryContext context);
-extern void PushOverrideSearchPath(OverrideSearchPath * newpath);
+extern void PushOverrideSearchPath(OverrideSearchPath *newpath);
 extern void PopOverrideSearchPath(void);
 
 extern Oid	FindConversionByName(List *conname);
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index ebf8abe92a4..99621d3b26e 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/defrem.h,v 1.85 2007/11/15 21:14:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/defrem.h,v 1.86 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -79,10 +79,10 @@ extern void AlterAggregateOwner(List *name, List *args, Oid newOwnerId);
 
 /* commands/opclasscmds.c */
 extern void DefineOpClass(CreateOpClassStmt *stmt);
-extern void DefineOpFamily(CreateOpFamilyStmt * stmt);
-extern void AlterOpFamily(AlterOpFamilyStmt * stmt);
+extern void DefineOpFamily(CreateOpFamilyStmt *stmt);
+extern void AlterOpFamily(AlterOpFamilyStmt *stmt);
 extern void RemoveOpClass(RemoveOpClassStmt *stmt);
-extern void RemoveOpFamily(RemoveOpFamilyStmt * stmt);
+extern void RemoveOpFamily(RemoveOpFamilyStmt *stmt);
 extern void RemoveOpClassById(Oid opclassOid);
 extern void RemoveOpFamilyById(Oid opfamilyOid);
 extern void RemoveAmOpEntryById(Oid entryOid);
@@ -104,7 +104,7 @@ extern void RenameTSDictionary(List *oldname, const char *newname);
 extern void RemoveTSDictionary(List *names, DropBehavior behavior,
 				   bool missing_ok);
 extern void RemoveTSDictionaryById(Oid dictId);
-extern void AlterTSDictionary(AlterTSDictionaryStmt * stmt);
+extern void AlterTSDictionary(AlterTSDictionaryStmt *stmt);
 extern void AlterTSDictionaryOwner(List *name, Oid newOwnerId);
 
 extern void DefineTSTemplate(List *names, List *parameters);
@@ -118,7 +118,7 @@ extern void RenameTSConfiguration(List *oldname, const char *newname);
 extern void RemoveTSConfiguration(List *names, DropBehavior behavior,
 					  bool missing_ok);
 extern void RemoveTSConfigurationById(Oid cfgId);
-extern void AlterTSConfiguration(AlterTSConfigurationStmt * stmt);
+extern void AlterTSConfiguration(AlterTSConfigurationStmt *stmt);
 extern void AlterTSConfigurationOwner(List *name, Oid newOwnerId);
 
 extern text *serialize_deflist(List *deflist);
diff --git a/src/include/commands/discard.h b/src/include/commands/discard.h
index 4549accebe6..0d025f6cb39 100644
--- a/src/include/commands/discard.h
+++ b/src/include/commands/discard.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/commands/discard.h,v 1.2 2007/11/15 21:14:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/discard.h,v 1.3 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,6 @@
 
 #include "nodes/parsenodes.h"
 
-extern void DiscardCommand(DiscardStmt * stmt, bool isTopLevel);
+extern void DiscardCommand(DiscardStmt *stmt, bool isTopLevel);
 
 #endif   /* DISCARD_H */
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index b20b642064b..2460a3e8166 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.33 2007/11/15 21:14:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.34 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,7 +38,7 @@ extern void ExplainOneUtility(Node *utilityStmt, ExplainStmt *stmt,
 				  ParamListInfo params,
 				  TupOutputState *tstate);
 
-extern void ExplainOnePlan(PlannedStmt * plannedstmt, ParamListInfo params,
+extern void ExplainOnePlan(PlannedStmt *plannedstmt, ParamListInfo params,
 			   ExplainStmt *stmt, TupOutputState *tstate);
 
 #endif   /* EXPLAIN_H */
diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h
index 502caafbd56..54f6a4fe692 100644
--- a/src/include/commands/portalcmds.h
+++ b/src/include/commands/portalcmds.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/portalcmds.h,v 1.24 2007/11/15 21:14:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/portalcmds.h,v 1.25 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
 #include "utils/portal.h"
 
 
-extern void PerformCursorOpen(PlannedStmt * stmt, ParamListInfo params,
+extern void PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params,
 				  const char *queryString, bool isTopLevel);
 
 extern void PerformPortalFetch(FetchStmt *stmt, DestReceiver *dest,
diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h
index d316b82f500..9f791c5b0a6 100644
--- a/src/include/commands/typecmds.h
+++ b/src/include/commands/typecmds.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/typecmds.h,v 1.20 2007/11/15 21:14:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/typecmds.h,v 1.21 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,7 @@ extern void RemoveType(List *names, DropBehavior behavior, bool missing_ok);
 extern void RemoveTypeById(Oid typeOid);
 extern void DefineDomain(CreateDomainStmt *stmt);
 extern void RemoveDomain(List *names, DropBehavior behavior, bool missing_ok);
-extern void DefineEnum(CreateEnumStmt * stmt);
+extern void DefineEnum(CreateEnumStmt *stmt);
 extern Oid	DefineCompositeType(const RangeVar *typevar, List *coldeflist);
 
 extern void AlterDomainDefault(List *names, Node *defaultRaw);
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index f3dff5d8a54..1bfb27e2c13 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/execdesc.h,v 1.35 2007/11/15 21:14:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/execdesc.h,v 1.36 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,7 +50,7 @@ typedef struct QueryDesc
 } QueryDesc;
 
 /* in pquery.c */
-extern QueryDesc *CreateQueryDesc(PlannedStmt * plannedstmt,
+extern QueryDesc *CreateQueryDesc(PlannedStmt *plannedstmt,
 				Snapshot snapshot,
 				Snapshot crosscheck_snapshot,
 				DestReceiver *dest,
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 47399bf047e..08b97e3adfc 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.143 2007/11/15 21:14:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.144 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,7 +73,7 @@ extern bool ExecMayReturnRawTuples(PlanState *node);
 /*
  * prototypes from functions in execCurrent.c
  */
-extern bool execCurrentOf(CurrentOfExpr * cexpr,
+extern bool execCurrentOf(CurrentOfExpr *cexpr,
 			  ExprContext *econtext,
 			  Oid table_oid,
 			  ItemPointer current_tid);
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index 4155055e101..5edb9d6dd8a 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.76 2007/11/15 21:14:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.77 2007/11/15 22:25:17 momjian Exp $
  *
  *	NOTES
  *		This is used both by the backend and by libpq, but should not be
@@ -313,7 +313,7 @@ typedef struct
 	uint32		utf1;			/* UTF-8 code 1 */
 	uint32		utf2;			/* UTF-8 code 2 */
 	uint32		code;			/* local code */
-}	pg_utf_to_local_combined;
+} pg_utf_to_local_combined;
 
 /*
  * local code to UTF-8 conversion map(combined characters)
@@ -323,7 +323,7 @@ typedef struct
 	uint32		code;			/* local code */
 	uint32		utf1;			/* UTF-8 code 1 */
 	uint32		utf2;			/* UTF-8 code 2 */
-}	pg_local_to_utf_combined;
+} pg_local_to_utf_combined;
 
 
 /*
@@ -387,11 +387,11 @@ extern unsigned short BIG5toCNS(unsigned short big5, unsigned char *lc);
 extern unsigned short CNStoBIG5(unsigned short cns, unsigned char lc);
 
 extern void LocalToUtf(const unsigned char *iso, unsigned char *utf,
-		   const pg_local_to_utf *map, const pg_local_to_utf_combined * cmap,
+		   const pg_local_to_utf *map, const pg_local_to_utf_combined *cmap,
 		   int size1, int size2, int encoding, int len);
 
 extern void UtfToLocal(const unsigned char *utf, unsigned char *iso,
-		   const pg_utf_to_local *map, const pg_utf_to_local_combined * cmap,
+		   const pg_utf_to_local *map, const pg_utf_to_local_combined *cmap,
 		   int size1, int size2, int encoding, int len);
 
 extern bool pg_verifymbstr(const char *mbstr, int len, bool noError);
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 24f472de91c..ca0e9c8fa78 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.180 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.181 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -658,7 +658,7 @@ typedef struct CoerceViaIOState
 	FmgrInfo	outfunc;		/* lookup info for source output function */
 	FmgrInfo	infunc;			/* lookup info for result input function */
 	Oid			intypioparam;	/* argument needed for input function */
-}	CoerceViaIOState;
+} CoerceViaIOState;
 
 /* ----------------
  *		ArrayCoerceExprState node
@@ -672,7 +672,7 @@ typedef struct ArrayCoerceExprState
 	FmgrInfo	elemfunc;		/* lookup info for element coercion function */
 	/* use struct pointer to avoid including array.h here */
 	struct ArrayMapState *amstate;		/* workspace for array_map */
-}	ArrayCoerceExprState;
+} ArrayCoerceExprState;
 
 /* ----------------
  *		ConvertRowtypeExprState node
@@ -784,7 +784,7 @@ typedef struct XmlExprState
 	List	   *named_args;		/* ExprStates for named arguments */
 	FmgrInfo   *named_outfuncs; /* array of output fns for named arguments */
 	List	   *args;			/* ExprStates for other arguments */
-}	XmlExprState;
+} XmlExprState;
 
 /* ----------------
  *		NullTestState node
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 3e7287166ef..51d760ef564 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.355 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.356 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,14 +34,14 @@ typedef enum SortByDir
 	SORTBY_ASC,
 	SORTBY_DESC,
 	SORTBY_USING				/* not allowed in CREATE INDEX ... */
-}	SortByDir;
+} SortByDir;
 
 typedef enum SortByNulls
 {
 	SORTBY_NULLS_DEFAULT,
 	SORTBY_NULLS_FIRST,
 	SORTBY_NULLS_LAST
-}	SortByNulls;
+} SortByNulls;
 
 
 /*
@@ -464,7 +464,7 @@ typedef struct XmlSerialize
 	XmlOptionType xmloption;
 	Node	   *expr;
 	TypeName   *typename;
-}	XmlSerialize;
+} XmlSerialize;
 
 
 /****************************************************************************
@@ -1065,7 +1065,7 @@ typedef enum
 	VAR_SET_MULTI,				/* special case for SET TRANSACTION ... */
 	VAR_RESET,					/* RESET var */
 	VAR_RESET_ALL				/* RESET ALL */
-}	VariableSetKind;
+} VariableSetKind;
 
 typedef struct VariableSetStmt
 {
@@ -1397,7 +1397,7 @@ typedef struct CreateOpFamilyStmt
 	NodeTag		type;
 	List	   *opfamilyname;	/* qualified name (list of Value strings) */
 	char	   *amname;			/* name of index AM opfamily is for */
-}	CreateOpFamilyStmt;
+} CreateOpFamilyStmt;
 
 /* ----------------------
  *		Alter Operator Family Statement
@@ -1410,7 +1410,7 @@ typedef struct AlterOpFamilyStmt
 	char	   *amname;			/* name of index AM opfamily is for */
 	bool		isDrop;			/* ADD or DROP the items? */
 	List	   *items;			/* List of CreateOpClassItem nodes */
-}	AlterOpFamilyStmt;
+} AlterOpFamilyStmt;
 
 /* ----------------------
  *		Drop Table|Sequence|View|Index|Type|Domain|Conversion|Schema Statement
@@ -1624,7 +1624,7 @@ typedef struct RemoveOpFamilyStmt
 	char	   *amname;			/* name of index AM opfamily is for */
 	DropBehavior behavior;		/* RESTRICT or CASCADE behavior */
 	bool		missing_ok;		/* skip error if missing? */
-}	RemoveOpFamilyStmt;
+} RemoveOpFamilyStmt;
 
 /* ----------------------
  *		Alter Object Rename Statement
@@ -1765,7 +1765,7 @@ typedef struct CreateEnumStmt
 	NodeTag		type;
 	List	   *typename;		/* qualified name (list of Value strings) */
 	List	   *vals;			/* enum values (list of Value strings) */
-}	CreateEnumStmt;
+} CreateEnumStmt;
 
 
 /* ----------------------
@@ -1892,13 +1892,13 @@ typedef enum DiscardMode
 	DISCARD_ALL,
 	DISCARD_PLANS,
 	DISCARD_TEMP
-}	DiscardMode;
+} DiscardMode;
 
 typedef struct DiscardStmt
 {
 	NodeTag		type;
 	DiscardMode target;
-}	DiscardStmt;
+} DiscardStmt;
 
 /* ----------------------
  *		LOCK Statement
@@ -2044,7 +2044,7 @@ typedef struct AlterTSDictionaryStmt
 	NodeTag		type;
 	List	   *dictname;		/* qualified name (list of Value strings) */
 	List	   *options;		/* List of DefElem nodes */
-}	AlterTSDictionaryStmt;
+} AlterTSDictionaryStmt;
 
 /*
  * TS Configuration stmts: DefineStmt, RenameStmt and DropStmt are default
@@ -2063,6 +2063,6 @@ typedef struct AlterTSConfigurationStmt
 	bool		override;		/* if true - remove old variant */
 	bool		replace;		/* if true - replace dictionary by another */
 	bool		missing_ok;		/* for DROP - skip error if missing? */
-}	AlterTSConfigurationStmt;
+} AlterTSConfigurationStmt;
 
 #endif   /* PARSENODES_H */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 6dab3cda689..7a283ec646a 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.97 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.98 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,7 +73,7 @@ typedef struct PlannedStmt
 	List	   *relationOids;	/* OIDs of relations the plan depends on */
 
 	int			nParamExec;		/* number of PARAM_EXEC Params used */
-}	PlannedStmt;
+} PlannedStmt;
 
 /* macro for fetching the Plan associated with a SubPlan node */
 #define exec_subplan_get_plan(plannedstmt, subplan) \
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 7cfa057d35e..4b940791a28 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.134 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.135 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -90,7 +90,7 @@ typedef struct IntoClause
 	List	   *options;		/* options from WITH clause */
 	OnCommitAction onCommit;	/* what do we do at COMMIT? */
 	char	   *tableSpaceName; /* table space to use, or NULL */
-}	IntoClause;
+} IntoClause;
 
 
 /* ----------------------------------------------------------------
@@ -566,7 +566,7 @@ typedef struct CoerceViaIO
 	Oid			resulttype;		/* output type of coercion */
 	/* output typmod is not stored, but is presumed -1 */
 	CoercionForm coerceformat;	/* how to display this node */
-}	CoerceViaIO;
+} CoerceViaIO;
 
 /* ----------------
  * ArrayCoerceExpr
@@ -589,7 +589,7 @@ typedef struct ArrayCoerceExpr
 	int32		resulttypmod;	/* output typmod (also element typmod) */
 	bool		isExplicit;		/* conversion semantics flag to pass to func */
 	CoercionForm coerceformat;	/* how to display this node */
-}	ArrayCoerceExpr;
+} ArrayCoerceExpr;
 
 /* ----------------
  * ConvertRowtypeExpr
@@ -792,13 +792,13 @@ typedef enum XmlExprOp
 	IS_XMLROOT,					/* XMLROOT(xml, version, standalone) */
 	IS_XMLSERIALIZE,			/* XMLSERIALIZE(is_document, xmlval) */
 	IS_DOCUMENT					/* xmlval IS DOCUMENT */
-}	XmlExprOp;
+} XmlExprOp;
 
 typedef enum
 {
 	XMLOPTION_DOCUMENT,
 	XMLOPTION_CONTENT
-}	XmlOptionType;
+} XmlOptionType;
 
 typedef struct XmlExpr
 {
@@ -811,7 +811,7 @@ typedef struct XmlExpr
 	XmlOptionType xmloption;	/* DOCUMENT or CONTENT */
 	Oid			type;			/* target type for XMLSERIALIZE */
 	int32		typmod;
-}	XmlExpr;
+} XmlExpr;
 
 /*
  * NullIfExpr - a NULLIF expression
@@ -933,7 +933,7 @@ typedef struct CurrentOfExpr
 	Index		cvarno;			/* RT index of target relation */
 	char	   *cursor_name;	/* name of referenced cursor, or NULL */
 	int			cursor_param;	/* refcursor parameter number, or 0 */
-}	CurrentOfExpr;
+} CurrentOfExpr;
 
 /*--------------------
  * TargetEntry -
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 2a33b82bd36..2dce223d3a7 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.149 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.150 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,7 @@ typedef struct PlannerGlobal
 	List	   *relationOids;	/* OIDs of relations the plan depends on */
 
 	bool		transientPlan;	/* redo plan when TransactionXmin changes? */
-}	PlannerGlobal;
+} PlannerGlobal;
 
 /* macro for fetching the Plan associated with a SubPlan node */
 #define planner_subplan_get_plan(root, subplan) \
@@ -477,7 +477,7 @@ typedef struct EquivalenceClass
 	bool		ec_broken;		/* failed to generate needed clauses? */
 	Index		ec_sortref;		/* originating sortclause label, or 0 */
 	struct EquivalenceClass *ec_merged; /* set if merged into another EC */
-}	EquivalenceClass;
+} EquivalenceClass;
 
 /*
  * EquivalenceMember - one member expression of an EquivalenceClass
@@ -503,7 +503,7 @@ typedef struct EquivalenceMember
 	bool		em_is_const;	/* expression is pseudoconstant? */
 	bool		em_is_child;	/* derived version for a child relation? */
 	Oid			em_datatype;	/* the "nominal type" used by the opfamily */
-}	EquivalenceMember;
+} EquivalenceMember;
 
 /*
  * PathKeys
@@ -530,7 +530,7 @@ typedef struct PathKey
 	Oid			pk_opfamily;	/* btree opfamily defining the ordering */
 	int			pk_strategy;	/* sort direction (ASC or DESC) */
 	bool		pk_nulls_first; /* do NULLs come before normal values? */
-}	PathKey;
+} PathKey;
 
 /*
  * Type "Path" is used as-is for sequential-scan paths.  For other
@@ -995,7 +995,7 @@ typedef struct MergeScanSelCache
 	/* Results */
 	Selectivity leftscansel;	/* scan fraction for clause left side */
 	Selectivity rightscansel;	/* scan fraction for clause right side */
-}	MergeScanSelCache;
+} MergeScanSelCache;
 
 /*
  * Inner indexscan info.
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 7d4607d9599..f1fadae461c 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/paths.h,v 1.101 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/paths.h,v 1.102 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,8 +62,8 @@ extern List *group_clauses_by_indexkey(IndexOptInfo *index,
 						  Relids outer_relids,
 						  SaOpControl saop_control,
 						  bool *found_clause);
-extern bool eclass_matches_any_index(EquivalenceClass * ec,
-						 EquivalenceMember * em,
+extern bool eclass_matches_any_index(EquivalenceClass *ec,
+						 EquivalenceMember *em,
 						 RelOptInfo *rel);
 extern bool match_index_to_operand(Node *operand, int indexcol,
 					   IndexOptInfo *index);
@@ -134,7 +134,7 @@ extern bool have_relevant_eclass_joinclause(PlannerInfo *root,
 								RelOptInfo *rel1, RelOptInfo *rel2);
 extern bool has_relevant_eclass_joinclause(PlannerInfo *root,
 							   RelOptInfo *rel1);
-extern bool eclass_useful_for_merging(EquivalenceClass * eclass,
+extern bool eclass_useful_for_merging(EquivalenceClass *eclass,
 						  RelOptInfo *rel);
 
 /*
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 1b30badf71c..2f895118814 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/planmain.h,v 1.104 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/planmain.h,v 1.105 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -93,10 +93,10 @@ extern RestrictInfo *build_implied_join_equality(Oid opno,
 /*
  * prototypes for plan/setrefs.c
  */
-extern Plan *set_plan_references(PlannerGlobal * glob,
+extern Plan *set_plan_references(PlannerGlobal *glob,
 					Plan *plan,
 					List *rtable);
-extern List *set_returning_clause_references(PlannerGlobal * glob,
+extern List *set_returning_clause_references(PlannerGlobal *glob,
 								List *rlist,
 								Plan *topplan,
 								Index resultRelation);
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 6712de93f3b..d04945b6cc5 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.42 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.43 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,7 +29,7 @@ extern PlannedStmt *planner(Query *parse, int cursorOptions,
 		ParamListInfo boundParams);
 extern PlannedStmt *standard_planner(Query *parse, int cursorOptions,
 				 ParamListInfo boundParams);
-extern Plan *subquery_planner(PlannerGlobal * glob, Query *parse,
+extern Plan *subquery_planner(PlannerGlobal *glob, Query *parse,
 				 Index level, double tuple_fraction,
 				 PlannerInfo **subroot);
 
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 479e1d85a35..73a787e6f5d 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.72 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.73 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,7 @@ typedef enum CoercionPathType
 	COERCION_PATH_RELABELTYPE,	/* binary-compatible cast, no function */
 	COERCION_PATH_ARRAYCOERCE,	/* need an ArrayCoerceExpr node */
 	COERCION_PATH_COERCEVIAIO	/* need a CoerceViaIO node */
-}	CoercionPathType;
+} CoercionPathType;
 
 
 extern bool IsBinaryCoercible(Oid srctype, Oid targettype);
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 2340ed69378..12b91a5d0df 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -5,7 +5,7 @@
  *
  *	Copyright (c) 2001-2007, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.69 2007/11/15 21:14:42 momjian Exp $
+ *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.70 2007/11/15 22:25:16 momjian Exp $
  * ----------
  */
 #ifndef PGSTAT_H
@@ -78,7 +78,7 @@ typedef struct PgStat_TableCounts
 
 	PgStat_Counter t_blocks_fetched;
 	PgStat_Counter t_blocks_hit;
-}	PgStat_TableCounts;
+} PgStat_TableCounts;
 
 
 /* ------------------------------------------------------------
@@ -108,7 +108,7 @@ typedef struct PgStat_TableStatus
 	bool		t_shared;		/* is it a shared catalog? */
 	struct PgStat_TableXactStatus *trans;		/* lowest subxact's counts */
 	PgStat_TableCounts t_counts;	/* event counts to be sent */
-}	PgStat_TableStatus;
+} PgStat_TableStatus;
 
 /* ----------
  * PgStat_TableXactStatus		Per-table, per-subtransaction status
@@ -124,7 +124,7 @@ typedef struct PgStat_TableXactStatus
 	PgStat_TableStatus *parent; /* per-table status */
 	/* structs of same subxact level are linked here: */
 	struct PgStat_TableXactStatus *next;		/* next of same subxact */
-}	PgStat_TableXactStatus;
+} PgStat_TableXactStatus;
 
 
 /* ------------------------------------------------------------
@@ -296,7 +296,7 @@ typedef struct PgStat_MsgBgWriter
 	PgStat_Counter m_maxwritten_clean;
 	PgStat_Counter m_buf_written_backend;
 	PgStat_Counter m_buf_alloc;
-}	PgStat_MsgBgWriter;
+} PgStat_MsgBgWriter;
 
 
 /* ----------
@@ -398,7 +398,7 @@ typedef struct PgStat_GlobalStats
 	PgStat_Counter maxwritten_clean;
 	PgStat_Counter buf_written_backend;
 	PgStat_Counter buf_alloc;
-}	PgStat_GlobalStats;
+} PgStat_GlobalStats;
 
 
 /* ----------
diff --git a/src/include/postgres.h b/src/include/postgres.h
index c8d541698d8..5f65b52b359 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1995, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/postgres.h,v 1.86 2007/11/15 21:14:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/postgres.h,v 1.87 2007/11/15 22:25:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -95,20 +95,20 @@ typedef union
 		uint32		va_rawsize; /* Original data size (excludes header) */
 		char		va_data[1]; /* Compressed data */
 	}			va_compressed;
-}	varattrib_4b;
+} varattrib_4b;
 
 typedef struct
 {
 	uint8		va_header;
 	char		va_data[1];		/* Data begins here */
-}	varattrib_1b;
+} varattrib_1b;
 
 typedef struct
 {
 	uint8		va_header;		/* Always 0x80 or 0x01 */
 	uint8		va_len_1be;		/* Physical length of datum */
 	char		va_data[1];		/* Data (for now always a TOAST pointer) */
-}	varattrib_1b_e;
+} varattrib_1b_e;
 
 /*
  * Bit layouts for varlena headers on big-endian machines:
diff --git a/src/include/postmaster/syslogger.h b/src/include/postmaster/syslogger.h
index e17611d2699..2dd7392d866 100644
--- a/src/include/postmaster/syslogger.h
+++ b/src/include/postmaster/syslogger.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2004-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.12 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.13 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,13 +49,13 @@ typedef struct
 	char		is_last;		/* last chunk of message? 't' or 'f' ('T' or
 								 * 'F' for CSV case) */
 	char		data[1];		/* data payload starts here */
-}	PipeProtoHeader;
+} PipeProtoHeader;
 
 typedef union
 {
 	PipeProtoHeader proto;
 	char		filler[PIPE_CHUNK_SIZE];
-}	PipeProtoChunk;
+} PipeProtoChunk;
 
 #define PIPE_HEADER_SIZE  offsetof(PipeProtoHeader, data)
 #define PIPE_MAX_PAYLOAD  ((int) (PIPE_CHUNK_SIZE - PIPE_HEADER_SIZE))
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 5e9d0896fbe..16f6b6dbe62 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.109 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.110 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,7 @@ typedef enum BufferAccessStrategyType
 	BAS_BULKREAD,				/* Large read-only scan (hint bit updates are
 								 * ok) */
 	BAS_VACUUM					/* VACUUM */
-}	BufferAccessStrategyType;
+} BufferAccessStrategyType;
 
 /* in globals.c ... this duplicates miscadmin.h */
 extern PGDLLIMPORT int NBuffers;
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 60989c8e3e5..52f29656f0a 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.109 2007/11/15 21:14:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.110 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,7 +62,7 @@ typedef struct
 	BackendId	backendId;		/* determined at backend startup */
 	LocalTransactionId localTransactionId;		/* backend-local transaction
 												 * id */
-}	VirtualTransactionId;
+} VirtualTransactionId;
 
 #define InvalidLocalTransactionId		0
 #define LocalTransactionIdIsValid(lxid) ((lxid) != InvalidLocalTransactionId)
@@ -446,7 +446,7 @@ typedef enum
 	DS_HARD_DEADLOCK,			/* deadlock, no way out but ERROR */
 	DS_BLOCKED_BY_AUTOVACUUM	/* no deadlock; queue blocked by autovacuum
 								 * worker */
-}	DeadLockState;
+} DeadLockState;
 
 
 /*
diff --git a/src/include/tsearch/dicts/regis.h b/src/include/tsearch/dicts/regis.h
index 47fc3ec76e3..2bc857bbd95 100644
--- a/src/include/tsearch/dicts/regis.h
+++ b/src/include/tsearch/dicts/regis.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/tsearch/dicts/regis.h,v 1.2 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/dicts/regis.h,v 1.3 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,7 @@ typedef struct RegisNode
 				unused:14;
 	struct RegisNode *next;
 	unsigned char data[1];
-}	RegisNode;
+} RegisNode;
 
 #define  RNHDRSZ	(offsetof(RegisNode,data))
 
@@ -36,14 +36,14 @@ typedef struct Regis
 				issuffix:1,
 				nchar:16,
 				unused:15;
-}	Regis;
+} Regis;
 
 bool		RS_isRegis(const char *str);
 
-void		RS_compile(Regis * r, bool issuffix, char *str);
-void		RS_free(Regis * r);
+void		RS_compile(Regis *r, bool issuffix, char *str);
+void		RS_free(Regis *r);
 
 /*returns true if matches */
-bool		RS_execute(Regis * r, char *str);
+bool		RS_execute(Regis *r, char *str);
 
 #endif
diff --git a/src/include/tsearch/dicts/spell.h b/src/include/tsearch/dicts/spell.h
index cfcc9391d63..dea3ddd84b5 100644
--- a/src/include/tsearch/dicts/spell.h
+++ b/src/include/tsearch/dicts/spell.h
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/tsearch/dicts/spell.h,v 1.4 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/dicts/spell.h,v 1.5 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,7 +33,7 @@ typedef struct
 				compoundflag:4,
 				affix:19;
 	struct SPNode *node;
-}	SPNodeData;
+} SPNodeData;
 
 /*
  * Names of FF_ are correlated with Hunspell options in affix file
@@ -50,7 +50,7 @@ typedef struct SPNode
 {
 	uint32		length;
 	SPNodeData	data[1];
-}	SPNode;
+} SPNode;
 
 #define SPNHDRSZ	(offsetof(SPNode,data))
 
@@ -71,7 +71,7 @@ typedef struct spell_struct
 		}			d;
 	}			p;
 	char		word[1];		/* variable length, null-terminated */
-}	SPELL;
+} SPELL;
 
 #define SPELLHDRSZ	(offsetof(SPELL, word))
 
@@ -90,7 +90,7 @@ typedef struct aff_struct
 		regex_t		regex;
 		Regis		regis;
 	}			reg;
-}	AFFIX;
+} AFFIX;
 
 /*
  * affixes use dictionary flags too
@@ -114,14 +114,14 @@ typedef struct
 				naff:24;
 	AFFIX	  **aff;
 	struct AffixNode *node;
-}	AffixNodeData;
+} AffixNodeData;
 
 typedef struct AffixNode
 {
 	uint32		isvoid:1,
 				length:31;
 	AffixNodeData data[1];
-}	AffixNode;
+} AffixNode;
 
 #define ANHRDSZ		   (offsetof(AffixNode, data))
 
@@ -130,7 +130,7 @@ typedef struct
 	char	   *affix;
 	int			len;
 	bool		issuffix;
-}	CMPDAffix;
+} CMPDAffix;
 
 typedef struct
 {
@@ -158,12 +158,12 @@ typedef struct
 
 	unsigned char flagval[256];
 	bool		usecompound;
-}	IspellDict;
+} IspellDict;
 
-extern TSLexeme *NINormalizeWord(IspellDict * Conf, char *word);
-extern void NIImportAffixes(IspellDict * Conf, const char *filename);
-extern void NIImportDictionary(IspellDict * Conf, const char *filename);
-extern void NISortDictionary(IspellDict * Conf);
-extern void NISortAffixes(IspellDict * Conf);
+extern TSLexeme *NINormalizeWord(IspellDict *Conf, char *word);
+extern void NIImportAffixes(IspellDict *Conf, const char *filename);
+extern void NIImportDictionary(IspellDict *Conf, const char *filename);
+extern void NISortDictionary(IspellDict *Conf);
+extern void NISortAffixes(IspellDict *Conf);
 
 #endif
diff --git a/src/include/tsearch/ts_cache.h b/src/include/tsearch/ts_cache.h
index c24a14c55a5..a5a23c2f676 100644
--- a/src/include/tsearch/ts_cache.h
+++ b/src/include/tsearch/ts_cache.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/tsearch/ts_cache.h,v 1.2 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_cache.h,v 1.3 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,7 @@ typedef struct TSAnyCacheEntry
 {
 	Oid			objId;
 	bool		isvalid;
-}	TSAnyCacheEntry;
+} TSAnyCacheEntry;
 
 
 typedef struct TSParserCacheEntry
@@ -47,7 +47,7 @@ typedef struct TSParserCacheEntry
 	FmgrInfo	prstoken;
 	FmgrInfo	prsend;
 	FmgrInfo	prsheadline;
-}	TSParserCacheEntry;
+} TSParserCacheEntry;
 
 typedef struct TSDictionaryCacheEntry
 {
@@ -61,13 +61,13 @@ typedef struct TSDictionaryCacheEntry
 
 	MemoryContext dictCtx;		/* memory context to store private data */
 	void	   *dictData;
-}	TSDictionaryCacheEntry;
+} TSDictionaryCacheEntry;
 
 typedef struct
 {
 	int			len;
 	Oid		   *dictIds;
-}	ListDictionary;
+} ListDictionary;
 
 typedef struct
 {
@@ -79,7 +79,7 @@ typedef struct
 
 	int			lenmap;
 	ListDictionary *map;
-}	TSConfigCacheEntry;
+} TSConfigCacheEntry;
 
 
 /*
diff --git a/src/include/tsearch/ts_public.h b/src/include/tsearch/ts_public.h
index d07e138464c..9ae5ce53b12 100644
--- a/src/include/tsearch/ts_public.h
+++ b/src/include/tsearch/ts_public.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1998-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/tsearch/ts_public.h,v 1.6 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_public.h,v 1.7 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@ typedef struct
 	int			lexid;
 	char	   *alias;
 	char	   *descr;
-}	LexDescr;
+} LexDescr;
 
 /*
  * Interface to headline generator
@@ -43,7 +43,7 @@ typedef struct
 				len:16;
 	char	   *word;
 	QueryOperand *item;
-}	HeadlineWordEntry;
+} HeadlineWordEntry;
 
 typedef struct
 {
@@ -54,7 +54,7 @@ typedef struct
 	char	   *stopsel;
 	int2		startsellen;
 	int2		stopsellen;
-}	HeadlineParsedText;
+} HeadlineParsedText;
 
 /*
  * Common useful things for tsearch subsystem
@@ -71,11 +71,11 @@ typedef struct
 {
 	int			len;
 	char	  **stop;
-}	StopList;
+} StopList;
 
-extern void readstoplist(const char *fname, StopList * s,
+extern void readstoplist(const char *fname, StopList *s,
 			 char *(*wordop) (const char *));
-extern bool searchstoplist(StopList * s, char *key);
+extern bool searchstoplist(StopList *s, char *key);
 
 /*
  * Interface with dictionaries
@@ -96,7 +96,7 @@ typedef struct
 
 	/* C-string */
 	char	   *lexeme;
-}	TSLexeme;
+} TSLexeme;
 
 #define TSL_ADDPOS		0x01
 
@@ -111,6 +111,6 @@ typedef struct
 	bool		getnext;		/* out: dict wants next lexeme */
 	void	   *private;		/* internal dict state between calls with
 								 * getnext == true */
-}	DictSubState;
+} DictSubState;
 
 #endif   /* _PG_TS_PUBLIC_H_ */
diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h
index 1d0fa44ba5f..d56e35cda2c 100644
--- a/src/include/tsearch/ts_type.h
+++ b/src/include/tsearch/ts_type.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1998-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/tsearch/ts_type.h,v 1.8 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_type.h,v 1.9 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@ typedef struct
 				haspos:1,
 				len:11,			/* MAX 2Kb */
 				pos:20;			/* MAX 1Mb */
-}	WordEntry;
+} WordEntry;
 
 #define MAXSTRLEN ( (1<<11) - 1)
 #define MAXSTRPOS ( (1<<20) - 1)
@@ -47,7 +47,7 @@ typedef struct
 {
 	uint16		npos;
 	WordEntryPos pos[1];		/* var length */
-}	WordEntryPosVector;
+} WordEntryPosVector;
 
 
 #define WEP_GETWEIGHT(x)	( (x) >> 14 )
@@ -84,7 +84,7 @@ typedef struct
 	int32		size;
 	WordEntry	entries[1];		/* var size */
 	/* lexemes follow */
-}	TSVectorData;
+} TSVectorData;
 
 typedef TSVectorData *TSVector;
 
@@ -188,7 +188,7 @@ typedef struct
 	uint32
 				length:12,
 				distance:20;
-}	QueryOperand;
+} QueryOperand;
 
 
 /* Legal values for QueryOperator.operator */
@@ -203,7 +203,7 @@ typedef struct
 	uint32		left;			/* pointer to left operand. Right operand is
 								 * item + 1, left operand is placed
 								 * item+item->left */
-}	QueryOperator;
+} QueryOperator;
 
 /*
  * Note: TSQuery is 4-bytes aligned, so make sure there's no fields
@@ -214,7 +214,7 @@ typedef union
 	QueryItemType type;
 	QueryOperator operator;
 	QueryOperand operand;
-}	QueryItem;
+} QueryItem;
 
 /*
  * Storage:
@@ -226,7 +226,7 @@ typedef struct
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	int4		size;			/* number of QueryItems */
 	char		data[1];
-}	TSQueryData;
+} TSQueryData;
 
 typedef TSQueryData *TSQuery;
 
diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h
index 2ed8485ec01..07507098298 100644
--- a/src/include/tsearch/ts_utils.h
+++ b/src/include/tsearch/ts_utils.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1998-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.9 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.10 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@ extern TSVectorParseState init_tsvector_parser(char *input,
 extern void reset_tsvector_parser(TSVectorParseState state, char *input);
 extern bool gettoken_tsvector(TSVectorParseState state,
 				  char **token, int *len,
-				  WordEntryPos ** pos, int *poslen,
+				  WordEntryPos **pos, int *poslen,
 				  char **endptr);
 extern void close_tsvector_parser(TSVectorParseState state);
 
@@ -76,7 +76,7 @@ typedef struct
 	}			pos;
 	char	   *word;
 	uint32		alen;
-}	ParsedWord;
+} ParsedWord;
 
 typedef struct
 {
@@ -84,9 +84,9 @@ typedef struct
 	int4		lenwords;
 	int4		curwords;
 	int4		pos;
-}	ParsedText;
+} ParsedText;
 
-extern void parsetext(Oid cfgId, ParsedText * prs, char *buf, int4 buflen);
+extern void parsetext(Oid cfgId, ParsedText *prs, char *buf, int4 buflen);
 
 /*
  * headline framework, flow in common to generate:
@@ -95,16 +95,16 @@ extern void parsetext(Oid cfgId, ParsedText * prs, char *buf, int4 buflen);
  *	3 generateHeadline to generate result text
  */
 
-extern void hlparsetext(Oid cfgId, HeadlineParsedText * prs, TSQuery query,
+extern void hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query,
 			char *buf, int4 buflen);
-extern text *generateHeadline(HeadlineParsedText * prs);
+extern text *generateHeadline(HeadlineParsedText *prs);
 
 /*
  * Common check function for tsvector @@ tsquery
  */
 
-extern bool TS_execute(QueryItem * curitem, void *checkval, bool calcnot,
-		   bool (*chkcond) (void *checkval, QueryOperand * val));
+extern bool TS_execute(QueryItem *curitem, void *checkval, bool calcnot,
+		   bool (*chkcond) (void *checkval, QueryOperand *val));
 
 /*
  * Useful conversion macros
@@ -115,7 +115,7 @@ extern bool TS_execute(QueryItem * curitem, void *checkval, bool calcnot,
 /*
  * to_ts* - text transformation to tsvector, tsquery
  */
-extern TSVector make_tsvector(ParsedText * prs);
+extern TSVector make_tsvector(ParsedText *prs);
 
 extern Datum to_tsvector_byid(PG_FUNCTION_ARGS);
 extern Datum to_tsvector(PG_FUNCTION_ARGS);
@@ -162,8 +162,8 @@ extern Datum gin_ts_consistent(PG_FUNCTION_ARGS);
 /*
  * TSQuery Utilities
  */
-extern QueryItem *clean_NOT(QueryItem * ptr, int4 *len);
-extern QueryItem *clean_fakeval(QueryItem * ptr, int4 *len);
+extern QueryItem *clean_NOT(QueryItem *ptr, int4 *len);
+extern QueryItem *clean_fakeval(QueryItem *ptr, int4 *len);
 
 typedef struct QTNode
 {
@@ -173,7 +173,7 @@ typedef struct QTNode
 	char	   *word;
 	uint32		sign;
 	struct QTNode **child;
-}	QTNode;
+} QTNode;
 
 /* bits in QTNode.flags */
 #define QTN_NEEDFREE	0x01
@@ -185,18 +185,18 @@ typedef uint64 TSQuerySign;
 #define TSQS_SIGLEN  (sizeof(TSQuerySign)*BITS_PER_BYTE)
 
 
-extern QTNode *QT2QTN(QueryItem * in, char *operand);
-extern TSQuery QTN2QT(QTNode * in);
-extern void QTNFree(QTNode * in);
-extern void QTNSort(QTNode * in);
-extern void QTNTernary(QTNode * in);
-extern void QTNBinary(QTNode * in);
-extern int	QTNodeCompare(QTNode * an, QTNode * bn);
-extern QTNode *QTNCopy(QTNode * in);
-extern void QTNClearFlags(QTNode * in, uint32 flags);
-extern bool QTNEq(QTNode * a, QTNode * b);
+extern QTNode *QT2QTN(QueryItem *in, char *operand);
+extern TSQuery QTN2QT(QTNode *in);
+extern void QTNFree(QTNode *in);
+extern void QTNSort(QTNode *in);
+extern void QTNTernary(QTNode *in);
+extern void QTNBinary(QTNode *in);
+extern int	QTNodeCompare(QTNode *an, QTNode *bn);
+extern QTNode *QTNCopy(QTNode *in);
+extern void QTNClearFlags(QTNode *in, uint32 flags);
+extern bool QTNEq(QTNode *a, QTNode *b);
 extern TSQuerySign makeTSQuerySign(TSQuery a);
-extern QTNode *findsubquery(QTNode * root, QTNode * ex, QTNode * subs,
+extern QTNode *findsubquery(QTNode *root, QTNode *ex, QTNode *subs,
 			 bool *isfind);
 
 /*
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index ea525f51aec..674b0113ef1 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -7,7 +7,7 @@
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <[email protected]>.
  *
- * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.87 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.88 2007/11/15 22:25:17 momjian Exp $
  *--------------------------------------------------------------------
  */
 #ifndef GUC_H
@@ -106,7 +106,7 @@ typedef enum
 	GUC_ACTION_SET,				/* regular SET command */
 	GUC_ACTION_LOCAL,			/* SET LOCAL command */
 	GUC_ACTION_SAVE				/* function SET option */
-}	GucAction;
+} GucAction;
 
 #define GUC_QUALIFIER_SEPARATOR '.'
 
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index 6685ba3e93f..c99072a33e8 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- *	  $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.36 2007/11/15 21:14:45 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.37 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -89,7 +89,7 @@ typedef enum
 	GUC_SET,					/* entry caused by plain SET command */
 	GUC_LOCAL,					/* entry caused by SET LOCAL command */
 	GUC_SET_LOCAL				/* entry caused by SET then SET LOCAL */
-}	GucStackState;
+} GucStackState;
 
 typedef struct guc_stack
 {
diff --git a/src/include/utils/plancache.h b/src/include/utils/plancache.h
index 2f8c423352c..e53b97b1ffe 100644
--- a/src/include/utils/plancache.h
+++ b/src/include/utils/plancache.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.9 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.10 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,7 +60,7 @@ typedef struct CachedPlanSource
 	struct CachedPlan *plan;	/* link to plan, or NULL if not valid */
 	MemoryContext context;		/* context containing this CachedPlanSource */
 	struct CachedPlan *orig_plan;		/* link to plan owning my context */
-}	CachedPlanSource;
+} CachedPlanSource;
 
 /*
  * CachedPlan represents the portion of a cached plan that is discarded when
@@ -80,7 +80,7 @@ typedef struct CachedPlan
 	int			refcount;		/* count of live references to this struct */
 	int			generation;		/* counter, starting at 1, for replans */
 	MemoryContext context;		/* context containing this CachedPlan */
-}	CachedPlan;
+} CachedPlan;
 
 
 extern void InitPlanCache(void);
@@ -103,10 +103,10 @@ extern CachedPlanSource *FastCreateCachedPlan(Node *raw_parse_tree,
 					 bool fully_planned,
 					 bool fixed_result,
 					 MemoryContext context);
-extern void DropCachedPlan(CachedPlanSource * plansource);
-extern CachedPlan *RevalidateCachedPlan(CachedPlanSource * plansource,
+extern void DropCachedPlan(CachedPlanSource *plansource);
+extern CachedPlan *RevalidateCachedPlan(CachedPlanSource *plansource,
 					 bool useResOwner);
-extern void ReleaseCachedPlan(CachedPlan * plan, bool useResOwner);
+extern void ReleaseCachedPlan(CachedPlan *plan, bool useResOwner);
 extern TupleDesc PlanCacheComputeResultDesc(List *stmt_list);
 
 extern void ResetPlanCache(void);
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 11453fbd8cd..d36b534fe08 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -39,7 +39,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.76 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.77 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -209,7 +209,7 @@ extern void PortalDefineQuery(Portal portal,
 				  const char *sourceText,
 				  const char *commandTag,
 				  List *stmts,
-				  CachedPlan * cplan);
+				  CachedPlan *cplan);
 extern Node *PortalListGetPrimaryStmt(List *stmts);
 extern void PortalCreateHoldStore(Portal portal);
 extern void PortalHashTableDeleteAll(void);
diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h
index 5caa0acef1f..ebb0036022e 100644
--- a/src/include/utils/resowner.h
+++ b/src/include/utils/resowner.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.13 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.14 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -110,9 +110,9 @@ extern void ResourceOwnerForgetRelationRef(ResourceOwner owner,
 /* support for plancache refcount management */
 extern void ResourceOwnerEnlargePlanCacheRefs(ResourceOwner owner);
 extern void ResourceOwnerRememberPlanCacheRef(ResourceOwner owner,
-								  CachedPlan * plan);
+								  CachedPlan *plan);
 extern void ResourceOwnerForgetPlanCacheRef(ResourceOwner owner,
-								CachedPlan * plan);
+								CachedPlan *plan);
 
 /* support for tupledesc refcount management */
 extern void ResourceOwnerEnlargeTupleDescs(ResourceOwner owner);
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 1f421424721..44c62cdcc5a 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.69 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.70 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,9 +40,9 @@ typedef struct SnapshotData
 	 * specially by HeapTupleSatisfiesDirty.)
 	 *
 	 * An MVCC snapshot can never see the effects of XIDs >= xmax. It can see
-	 * the effects of all older XIDs except those listed in the snapshot.
-	 * xmin is stored as an optimization to avoid needing to search the XID
-	 * arrays for most tuples.
+	 * the effects of all older XIDs except those listed in the snapshot. xmin
+	 * is stored as an optimization to avoid needing to search the XID arrays
+	 * for most tuples.
 	 */
 	TransactionId xmin;			/* all XID < xmin are visible to me */
 	TransactionId xmax;			/* all XID >= xmax are invisible to me */
diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h
index 1d2d060e5cf..9f3d213dfdd 100644
--- a/src/include/utils/xml.h
+++ b/src/include/utils/xml.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.20 2007/11/15 21:14:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.21 2007/11/15 22:25:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,15 +61,15 @@ typedef enum
 	XML_STANDALONE_NO,
 	XML_STANDALONE_NO_VALUE,
 	XML_STANDALONE_OMITTED
-}	XmlStandaloneType;
+} XmlStandaloneType;
 
 extern xmltype *xmlconcat(List *args);
-extern xmltype *xmlelement(XmlExprState * xmlExpr, ExprContext *econtext);
+extern xmltype *xmlelement(XmlExprState *xmlExpr, ExprContext *econtext);
 extern xmltype *xmlparse(text *data, XmlOptionType xmloption, bool preserve_whitespace);
 extern xmltype *xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null);
-extern xmltype *xmlroot(xmltype * data, text *version, int standalone);
-extern bool xml_is_document(xmltype * arg);
-extern text *xmltotext_with_xmloption(xmltype * data, XmlOptionType xmloption_arg);
+extern xmltype *xmlroot(xmltype *data, text *version, int standalone);
+extern bool xml_is_document(xmltype *arg);
+extern text *xmltotext_with_xmloption(xmltype *data, XmlOptionType xmloption_arg);
 
 extern char *map_sql_identifier_to_xml_name(char *ident, bool fully_escaped, bool escape_period);
 extern char *map_xml_name_to_sql_identifier(char *name);
@@ -79,7 +79,7 @@ typedef enum
 {
 	XMLBINARY_BASE64,
 	XMLBINARY_HEX
-}	XmlBinaryType;
+} XmlBinaryType;
 
 extern XmlBinaryType xmlbinary;