Re-run pgindent, fixing a problem where comment lines after a blank

comment line where output as too long, and update typedefs for /lib
directory.  Also fix case where identifiers were used as variable names
in the backend, but as typedefs in ecpg (favor the backend for
indenting).

Backpatch to 8.1.X.

24 files changed, 112 insertions, 114 deletions

diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 3a10fa34fd..fa3fc0554c 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.79 2005/11/20 19:49:08 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.80 2005/11/22 18:17:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -372,7 +372,7 @@ do { \
  *	 This is the output format of heap_form_tuple and related routines.
  *
  * * Separately allocated tuple: t_data points to a palloc'd chunk that
- *	 is not adjacent to the HeapTupleData.  (This case is deprecated since
+ *	 is not adjacent to the HeapTupleData.	(This case is deprecated since
  *	 it's difficult to tell apart from case #1.  It should be used only in
  *	 limited contexts where the code knows that case #1 will never apply.)
  *
diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h
index b5870e69dc..e02da8c5b6 100644
--- a/src/include/access/tuptoaster.h
+++ b/src/include/access/tuptoaster.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.24 2005/11/20 18:38:20 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.25 2005/11/22 18:17:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -72,7 +72,7 @@
  * ----------
  */
 extern HeapTuple toast_insert_or_update(Relation rel,
-										HeapTuple newtup, HeapTuple oldtup);
+					   HeapTuple newtup, HeapTuple oldtup);
 
 /* ----------
  * toast_delete -
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index 71fb126638..e87dd88b6a 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_constraint.h,v 1.18 2005/10/15 02:49:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_constraint.h,v 1.19 2005/11/22 18:17:30 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -61,8 +61,8 @@ CATALOG(pg_constraint,2606)
 	 * contypid links to the pg_type row for a domain if this is a domain
 	 * constraint.	Otherwise it's 0.
 	 *
-	 * For SQL-style global ASSERTIONs, both conrelid and contypid would be zero.
-	 * This is not presently supported, however.
+	 * For SQL-style global ASSERTIONs, both conrelid and contypid would be
+	 * zero. This is not presently supported, however.
 	 */
 	Oid			contypid;		/* domain this constraint constrains */
 
diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h
index 847ad08b2e..4b13d6f398 100644
--- a/src/include/catalog/pg_control.h
+++ b/src/include/catalog/pg_control.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.25 2005/10/15 02:49:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.26 2005/11/22 18:17:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -87,9 +87,9 @@ typedef struct ControlFileData
 	 * pg_control_version identifies the format of pg_control itself.
 	 * catalog_version_no identifies the format of the system catalogs.
 	 *
-	 * There are additional version identifiers in individual files; for example,
-	 * WAL logs contain per-page magic numbers that can serve as version cues
-	 * for the WAL log.
+	 * There are additional version identifiers in individual files; for
+	 * example, WAL logs contain per-page magic numbers that can serve as
+	 * version cues for the WAL log.
 	 */
 	uint32		pg_control_version;		/* PG_CONTROL_VERSION */
 	uint32		catalog_version_no;		/* see catversion.h */
diff --git a/src/include/catalog/pg_shdepend.h b/src/include/catalog/pg_shdepend.h
index de4f6eb0d4..753fd31fb4 100644
--- a/src/include/catalog/pg_shdepend.h
+++ b/src/include/catalog/pg_shdepend.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_shdepend.h,v 1.2 2005/10/15 02:49:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_shdepend.h,v 1.3 2005/11/22 18:17:30 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -37,8 +37,8 @@ CATALOG(pg_shdepend,1214) BKI_SHARED_RELATION BKI_WITHOUT_OIDS
 	/*
 	 * Identification of the dependent (referencing) object.
 	 *
-	 * These fields are all zeroes for a DEPENDENCY_PIN entry.	Also, dbid can be
-	 * zero to denote a shared object.
+	 * These fields are all zeroes for a DEPENDENCY_PIN entry.	Also, dbid can
+	 * be zero to denote a shared object.
 	 */
 	Oid			dbid;			/* OID of database containing object */
 	Oid			classid;		/* OID of table containing object */
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 0e3dd006c4..4b7b7c2652 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.166 2005/10/15 02:49:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.167 2005/11/22 18:17:30 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -148,8 +148,8 @@ CATALOG(pg_type,1247) BKI_BOOTSTRAP
 	/*
 	 * This flag represents a "NOT NULL" constraint against this datatype.
 	 *
-	 * If true, the attnotnull column for a corresponding table column using this
-	 * datatype will always enforce the NOT NULL constraint.
+	 * If true, the attnotnull column for a corresponding table column using
+	 * this datatype will always enforce the NOT NULL constraint.
 	 *
 	 * Used primarily for domain types.
 	 */
diff --git a/src/include/commands/conversioncmds.h b/src/include/commands/conversioncmds.h
index 05d30a31cb..01d28e323c 100644
--- a/src/include/commands/conversioncmds.h
+++ b/src/include/commands/conversioncmds.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/conversioncmds.h,v 1.12 2005/11/21 12:49:32 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/commands/conversioncmds.h,v 1.13 2005/11/22 18:17:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,8 +18,8 @@
 #include "nodes/parsenodes.h"
 
 extern void CreateConversionCommand(CreateConversionStmt *parsetree);
-extern void DropConversionCommand(List *conversion_name, 
-								  DropBehavior behavior, bool missing_ok);
+extern void DropConversionCommand(List *conversion_name,
+					  DropBehavior behavior, bool missing_ok);
 extern void RenameConversion(List *name, const char *newname);
 extern void AlterConversionOwner(List *name, Oid newOwnerId);
 extern void AlterConversionOwner_oid(Oid conversionOid, Oid newOwnerId);
diff --git a/src/include/commands/user.h b/src/include/commands/user.h
index a8fba2f874..86199669bd 100644
--- a/src/include/commands/user.h
+++ b/src/include/commands/user.h
@@ -4,7 +4,7 @@
  *	  Commands for manipulating roles (formerly called users).
  *
  *
- * $PostgreSQL: pgsql/src/include/commands/user.h,v 1.28 2005/11/21 12:49:32 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/commands/user.h,v 1.29 2005/11/22 18:17:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@ extern void AlterRoleSet(AlterRoleSetStmt *stmt);
 extern void DropRole(DropRoleStmt *stmt);
 extern void GrantRole(GrantRoleStmt *stmt);
 extern void RenameRole(const char *oldname, const char *newname);
-extern void DropOwnedObjects(DropOwnedStmt *stmt);
-extern void ReassignOwnedObjects(ReassignOwnedStmt *stmt);
+extern void DropOwnedObjects(DropOwnedStmt * stmt);
+extern void ReassignOwnedObjects(ReassignOwnedStmt * stmt);
 
 #endif   /* USER_H */
diff --git a/src/include/funcapi.h b/src/include/funcapi.h
index 8357cdd6ed..1f455d3eea 100644
--- a/src/include/funcapi.h
+++ b/src/include/funcapi.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 2002-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/funcapi.h,v 1.20 2005/10/15 02:49:41 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/funcapi.h,v 1.21 2005/11/22 18:17:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -67,9 +67,9 @@ typedef struct FuncCallContext
 	/*
 	 * OPTIONAL maximum number of calls
 	 *
-	 * max_calls is here for convenience only and setting it is optional. If not
-	 * set, you must provide alternative means to know when the function is
-	 * done.
+	 * max_calls is here for convenience only and setting it is optional. If
+	 * not set, you must provide alternative means to know when the function
+	 * is done.
 	 */
 	uint32		max_calls;
 
@@ -84,25 +84,25 @@ typedef struct FuncCallContext
 	/*
 	 * OPTIONAL pointer to miscellaneous user-provided context information
 	 *
-	 * user_fctx is for use as a pointer to your own struct to retain arbitrary
-	 * context information between calls of your function.
+	 * user_fctx is for use as a pointer to your own struct to retain
+	 * arbitrary context information between calls of your function.
 	 */
 	void	   *user_fctx;
 
 	/*
 	 * OPTIONAL pointer to struct containing attribute type input metadata
 	 *
-	 * attinmeta is for use when returning tuples (i.e. composite data types) and
-	 * is not used when returning base data types. It is only needed if you
-	 * intend to use BuildTupleFromCStrings() to create the return tuple.
+	 * attinmeta is for use when returning tuples (i.e. composite data types)
+	 * and is not used when returning base data types. It is only needed if
+	 * you intend to use BuildTupleFromCStrings() to create the return tuple.
 	 */
 	AttInMetadata *attinmeta;
 
 	/*
 	 * memory context used for structures that must live for multiple calls
 	 *
-	 * multi_call_memory_ctx is set by SRF_FIRSTCALL_INIT() for you, and used by
-	 * SRF_RETURN_DONE() for cleanup. It is the most appropriate memory
+	 * multi_call_memory_ctx is set by SRF_FIRSTCALL_INIT() for you, and used
+	 * by SRF_RETURN_DONE() for cleanup. It is the most appropriate memory
 	 * context for any memory that is to be reused across multiple calls of
 	 * the SRF.
 	 */
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index aeb86b4c76..784edbdd64 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.32 2005/10/17 16:24:20 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.33 2005/11/22 18:17:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,6 +28,6 @@ extern int md5_crypt_verify(const Port *port, const char *user,
 /* in md5.c --- these are also present in frontend libpq */
 extern bool pg_md5_hash(const void *buff, size_t len, char *hexsum);
 extern bool pg_md5_encrypt(const char *passwd, const char *salt,
-		   size_t salt_len, char *buf);
+			   size_t salt_len, char *buf);
 
 #endif
diff --git a/src/include/libpq/ip.h b/src/include/libpq/ip.h
index 57858934bd..097f738ba7 100644
--- a/src/include/libpq/ip.h
+++ b/src/include/libpq/ip.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2003-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/libpq/ip.h,v 1.15 2005/10/17 16:24:20 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/ip.h,v 1.16 2005/11/22 18:17:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,25 +17,25 @@
 
 
 extern int pg_getaddrinfo_all(const char *hostname, const char *servname,
-				const struct addrinfo *hintp,
-				struct addrinfo **result);
-extern void pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo *ai);
+				   const struct addrinfo * hintp,
+				   struct addrinfo ** result);
+extern void pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai);
 
-extern int pg_getnameinfo_all(const struct sockaddr_storage *addr, int salen,
-				char *node, int nodelen,
-				char *service, int servicelen,
-				int flags);
+extern int pg_getnameinfo_all(const struct sockaddr_storage * addr, int salen,
+				   char *node, int nodelen,
+				   char *service, int servicelen,
+				   int flags);
 
-extern int pg_range_sockaddr(const struct sockaddr_storage *addr,
-			  const struct sockaddr_storage *netaddr,
-			  const struct sockaddr_storage *netmask);
+extern int pg_range_sockaddr(const struct sockaddr_storage * addr,
+				  const struct sockaddr_storage * netaddr,
+				  const struct sockaddr_storage * netmask);
 
-extern int pg_sockaddr_cidr_mask(struct sockaddr_storage *mask,
-				   char *numbits, int family);
+extern int pg_sockaddr_cidr_mask(struct sockaddr_storage * mask,
+					  char *numbits, int family);
 
 #ifdef HAVE_IPV6
-extern void pg_promote_v4_to_v6_addr(struct sockaddr_storage *addr);
-extern void pg_promote_v4_to_v6_mask(struct sockaddr_storage *addr);
+extern void pg_promote_v4_to_v6_addr(struct sockaddr_storage * addr);
+extern void pg_promote_v4_to_v6_mask(struct sockaddr_storage * addr);
 #endif
 
 #ifdef	HAVE_UNIX_SOCKETS
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 8d7f88d135..e993929f54 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.53 2005/11/05 03:04:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.54 2005/11/22 18:17:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -85,9 +85,9 @@ typedef struct Port
 	/*
 	 * TCP keepalive settings.
 	 *
-	 * default values are 0 if AF_UNIX or not yet known; current values are 0 if
-	 * AF_UNIX or using the default. Also, -1 in a default value means we were
-	 * unable to find out the default (getsockopt failed).
+	 * default values are 0 if AF_UNIX or not yet known; current values are 0
+	 * if AF_UNIX or using the default. Also, -1 in a default value means we
+	 * were unable to find out the default (getsockopt failed).
 	 */
 	int			default_keepalives_idle;
 	int			default_keepalives_interval;
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index fc13891e41..e354b816c2 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.183 2005/10/25 15:15:16 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.184 2005/11/22 18:17:29 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file should be moved to other files.
@@ -83,7 +83,6 @@ do { \
 	if (InterruptPending) \
 		ProcessInterrupts(); \
 } while(0)
-
 #else							/* WIN32 */
 
 #define CHECK_FOR_INTERRUPTS() \
@@ -93,7 +92,6 @@ do { \
 	if (InterruptPending) \
 		ProcessInterrupts(); \
 } while(0)
-
 #endif   /* WIN32 */
 
 
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index c638c28a02..63e864e463 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.140 2005/11/14 17:42:55 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.141 2005/11/22 18:17:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -304,7 +304,7 @@ typedef struct EState
 	ResultRelInfo *es_result_relation_info;		/* currently active array elt */
 	JunkFilter *es_junkFilter;	/* currently active junk filter */
 
-	TupleTableSlot *es_trig_tuple_slot;			/* for trigger output tuples */
+	TupleTableSlot *es_trig_tuple_slot; /* for trigger output tuples */
 
 	Relation	es_into_relation_descriptor;	/* for SELECT INTO */
 	bool		es_into_relation_use_wal;
@@ -491,9 +491,9 @@ typedef struct FuncExprState
 	 * We also need to store argument values across calls when evaluating a
 	 * function-returning-set.
 	 *
-	 * setArgsValid is true when we are evaluating a set-valued function and we
-	 * are in the middle of a call series; we want to pass the same argument
-	 * values to the function again (and again, until it returns
+	 * setArgsValid is true when we are evaluating a set-valued function and
+	 * we are in the middle of a call series; we want to pass the same
+	 * argument values to the function again (and again, until it returns
 	 * ExprEndResult).
 	 */
 	bool		setArgsValid;
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 919753ea92..e9ec4b8ad6 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.177 2005/11/21 12:49:32 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.178 2005/11/22 18:17:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -141,8 +141,8 @@ typedef enum NodeTag
 	/*
 	 * TAGS FOR EXPRESSION STATE NODES (execnodes.h)
 	 *
-	 * These correspond (not always one-for-one) to primitive nodes derived from
-	 * Expr.
+	 * These correspond (not always one-for-one) to primitive nodes derived
+	 * from Expr.
 	 */
 	T_ExprState = 400,
 	T_GenericExprState,
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index f2d00b593e..478279c54b 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.295 2005/11/22 15:24:18 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.296 2005/11/22 18:17:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -533,9 +533,9 @@ typedef struct RangeTblEntry
 	/*
 	 * Fields valid for a join RTE (else NULL/zero):
 	 *
-	 * joinaliasvars is a list of Vars or COALESCE expressions corresponding to
-	 * the columns of the join result.	An alias Var referencing column K of
-	 * the join result can be replaced by the K'th element of joinaliasvars
+	 * joinaliasvars is a list of Vars or COALESCE expressions corresponding
+	 * to the columns of the join result.  An alias Var referencing column K
+	 * of the join result can be replaced by the K'th element of joinaliasvars
 	 * --- but to simplify the task of reverse-listing aliases correctly, we
 	 * do not do that until planning time.	In a Query loaded from a stored
 	 * rule, it is also possible for joinaliasvars items to be NULL Consts,
@@ -1278,7 +1278,7 @@ typedef struct DropStmt
 	List	   *objects;		/* list of sublists of names (as Values) */
 	ObjectType	removeType;		/* object type */
 	DropBehavior behavior;		/* RESTRICT or CASCADE behavior */
-	bool         missing_ok;    /* skip error if object is missing? */
+	bool		missing_ok;		/* skip error if object is missing? */
 } DropStmt;
 
 /* ----------------------
@@ -1672,7 +1672,7 @@ typedef struct DropdbStmt
 {
 	NodeTag		type;
 	char	   *dbname;			/* database to drop */
-	bool        missing_ok;     /* skip error if db is missing? */
+	bool		missing_ok;		/* skip error if db is missing? */
 } DropdbStmt;
 
 /* ----------------------
@@ -1877,23 +1877,23 @@ typedef struct DeallocateStmt
 } DeallocateStmt;
 
 /*
- * 		DROP OWNED statement
+ *		DROP OWNED statement
  */
 typedef struct DropOwnedStmt
 {
 	NodeTag		type;
 	List	   *roles;
 	DropBehavior behavior;
-} DropOwnedStmt;
+}	DropOwnedStmt;
 
 /*
- * 		REASSIGN OWNED statement
+ *		REASSIGN OWNED statement
  */
 typedef struct ReassignOwnedStmt
 {
 	NodeTag		type;
 	List	   *roles;
 	char	   *newrole;
-} ReassignOwnedStmt;
+}	ReassignOwnedStmt;
 
 #endif   /* PARSENODES_H */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 4a0ff51afd..01333707d4 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.80 2005/10/15 02:49:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.81 2005/11/22 18:17:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,13 +65,13 @@ typedef struct Plan
 	/*
 	 * Information for management of parameter-change-driven rescanning
 	 *
-	 * extParam includes the paramIDs of all external PARAM_EXEC params affecting
-	 * this plan node or its children.	setParam params from the node's
-	 * initPlans are not included, but their extParams are.
+	 * extParam includes the paramIDs of all external PARAM_EXEC params
+	 * affecting this plan node or its children.  setParam params from the
+	 * node's initPlans are not included, but their extParams are.
 	 *
-	 * allParam includes all the extParam paramIDs, plus the IDs of local params
-	 * that affect the node (i.e., the setParams of its initplans). These are
-	 * _all_ the PARAM_EXEC params that affect this node.
+	 * allParam includes all the extParam paramIDs, plus the IDs of local
+	 * params that affect the node (i.e., the setParams of its initplans).
+	 * These are _all_ the PARAM_EXEC params that affect this node.
 	 */
 	Bitmapset  *extParam;
 	Bitmapset  *allParam;
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index c55ce699bc..3bab9e85b4 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.82 2005/11/17 17:42:02 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.83 2005/11/22 18:17:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -199,7 +199,7 @@ extern BufferDesc *LocalBufferAlloc(Relation reln, BlockNumber blockNum,
 				 bool *foundPtr);
 extern void WriteLocalBuffer(Buffer buffer, bool release);
 extern void DropRelFileNodeLocalBuffers(RelFileNode rnode,
-										BlockNumber firstDelBlock);
+							BlockNumber firstDelBlock);
 extern void AtEOXact_LocalBuffers(bool isCommit);
 
 #endif   /* BUFMGR_INTERNALS_H */
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index 68c926a9a6..4a1fe09a30 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -54,7 +54,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/tcop/dest.h,v 1.48 2005/11/03 17:11:40 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/tcop/dest.h,v 1.49 2005/11/22 18:17:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -79,12 +79,12 @@
  */
 typedef enum
 {
-	DestNone,				/* results are discarded */
-	DestDebug,				/* results go to debugging output */
-	DestRemote,				/* results sent to frontend process */
-	DestRemoteExecute,		/* sent to frontend, in Execute command */
-	DestSPI,				/* results sent to SPI manager */
-	DestTuplestore			/* results sent to Tuplestore */
+	DestNone,					/* results are discarded */
+	DestDebug,					/* results go to debugging output */
+	DestRemote,					/* results sent to frontend process */
+	DestRemoteExecute,			/* sent to frontend, in Execute command */
+	DestSPI,					/* results sent to SPI manager */
+	DestTuplestore				/* results sent to Tuplestore */
 } CommandDest;
 
 /* ----------------
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 7b2122b9a9..04c5631214 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.89 2005/11/21 12:49:33 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.90 2005/11/22 18:17:31 momjian Exp $
  *
  * NOTES
  *	  An ACL array is simply an array of AclItems, representing the union
@@ -80,7 +80,7 @@ typedef struct AclItem
 /*
  * Definitions for convenient access to Acl (array of AclItem).
  * These are standard PostgreSQL arrays, but are restricted to have one
- * dimension and no nulls.  We also ignore the lower bound when reading,
+ * dimension and no nulls.	We also ignore the lower bound when reading,
  * and set it to one when writing.
  *
  * CAUTION: as of PostgreSQL 7.1, these arrays are toastable (just like all
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index d3653cff0d..97dedf3b5f 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *	  <elemtype>	- element type OID
  *	  <dimensions>	- length of each array axis (C array of int)
  *	  <lower bnds>	- lower boundary of each dimension (C array of int)
- *	  <null bitmap>	- bitmap showing locations of nulls (OPTIONAL)
+ *	  <null bitmap> - bitmap showing locations of nulls (OPTIONAL)
  *	  <actual data> - whatever is the stored data
  *
  * The <dimensions> and <lower bnds> arrays each have ndim elements.
@@ -49,7 +49,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/array.h,v 1.56 2005/11/17 22:14:55 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/array.h,v 1.57 2005/11/22 18:17:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -220,8 +220,8 @@ extern Datum array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
 		  ArrayMapState *amstate);
 
 extern void array_bitmap_copy(bits8 *destbitmap, int destoffset,
-							  const bits8 *srcbitmap, int srcoffset,
-							  int nitems);
+				  const bits8 *srcbitmap, int srcoffset,
+				  int nitems);
 
 extern ArrayType *construct_array(Datum *elems, int nelems,
 				Oid elmtype,
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 1ec358f384..4d1349917c 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.267 2005/10/18 20:38:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.268 2005/11/22 18:17:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -594,7 +594,7 @@ extern bool SplitIdentifierString(char *rawstring, char separator,
 					  List **namelist);
 extern Datum replace_text(PG_FUNCTION_ARGS);
 extern text *replace_text_regexp(text *src_text, void *regexp,
-								 text *replace_text, bool glob);
+					text *replace_text, bool glob);
 extern Datum split_text(PG_FUNCTION_ARGS);
 extern Datum text_to_array(PG_FUNCTION_ARGS);
 extern Datum array_to_text(PG_FUNCTION_ARGS);
@@ -753,7 +753,7 @@ extern Datum numeric_in(PG_FUNCTION_ARGS);
 extern Datum numeric_out(PG_FUNCTION_ARGS);
 extern Datum numeric_recv(PG_FUNCTION_ARGS);
 extern Datum numeric_send(PG_FUNCTION_ARGS);
-extern Datum numeric(PG_FUNCTION_ARGS);
+extern Datum numeric (PG_FUNCTION_ARGS);
 extern Datum numeric_abs(PG_FUNCTION_ARGS);
 extern Datum numeric_uminus(PG_FUNCTION_ARGS);
 extern Datum numeric_uplus(PG_FUNCTION_ARGS);
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 6fb358b813..dea6dc3940 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.56 2005/10/15 02:49:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.57 2005/11/22 18:17:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -98,8 +98,8 @@ typedef struct catctup
 	 * refcount must go to zero, too; also, remember to mark the list dead at
 	 * the same time the tuple is marked.)
 	 *
-	 * A negative cache entry is an assertion that there is no tuple matching a
-	 * particular key.	This is just as useful as a normal entry so far as
+	 * A negative cache entry is an assertion that there is no tuple matching
+	 * a particular key.  This is just as useful as a normal entry so far as
 	 * avoiding catalog searches is concerned.	Management of positive and
 	 * negative entries is identical.
 	 */
@@ -125,14 +125,14 @@ typedef struct catclist
 	 * table rows satisfying the partial key.  (Note: none of these will be
 	 * negative cache entries.)
 	 *
-	 * A CatCList is only a member of a per-cache list; we do not do separate LRU
-	 * management for CatCLists.  See CatalogCacheCleanup() for the details of
-	 * the management algorithm.
+	 * A CatCList is only a member of a per-cache list; we do not do separate
+	 * LRU management for CatCLists.  See CatalogCacheCleanup() for the
+	 * details of the management algorithm.
 	 *
-	 * A list marked "dead" must not be returned by subsequent searches. However,
-	 * it won't be physically deleted from the cache until its refcount goes
-	 * to zero.  (A list should be marked dead if any of its member entries
-	 * are dead.)
+	 * A list marked "dead" must not be returned by subsequent searches.
+	 * However, it won't be physically deleted from the cache until its
+	 * refcount goes to zero.  (A list should be marked dead if any of its
+	 * member entries are dead.)
 	 *
 	 * If "ordered" is true then the member tuples appear in the order of the
 	 * cache's underlying index.  This will be true in normal operation, but
diff --git a/src/include/utils/typcache.h b/src/include/utils/typcache.h
index 64fe33d81d..1aba161f67 100644
--- a/src/include/utils/typcache.h
+++ b/src/include/utils/typcache.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/typcache.h,v 1.8 2005/10/15 02:49:47 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/typcache.h,v 1.9 2005/11/22 18:17:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,8 +35,8 @@ typedef struct TypeCacheEntry
 	/*
 	 * Information obtained from opclass entries
 	 *
-	 * These will be InvalidOid if no match could be found, or if the information
-	 * hasn't yet been requested.
+	 * These will be InvalidOid if no match could be found, or if the
+	 * information hasn't yet been requested.
 	 */
 	Oid			btree_opc;		/* OID of the default btree opclass */
 	Oid			hash_opc;		/* OID of the default hash opclass */