Another pgindent run. Fixes enum indenting, and improves #endif

spacing.  Also adds space for one-line comments.

41 files changed, 109 insertions, 71 deletions

diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index eb227b3ea93..838936e93d0 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: acl.h,v 1.37 2001/10/25 05:50:10 momjian Exp $
+ * $Id: acl.h,v 1.38 2001/10/28 06:26:09 momjian Exp $
  *
  * NOTES
  *	  For backward-compatibility purposes we have to allow there
@@ -207,4 +207,5 @@ extern bool pg_func_ownercheck(Oid userid, char *funcname,
 				   int nargs, Oid *arglist);
 extern bool pg_aggr_ownercheck(Oid userid, char *aggname,
 				   Oid basetypeID);
+
 #endif	 /* ACL_H */
diff --git a/src/include/utils/ascii.h b/src/include/utils/ascii.h
index cfead8bd1aa..01777c761bc 100644
--- a/src/include/utils/ascii.h
+++ b/src/include/utils/ascii.h
@@ -2,7 +2,7 @@
 /* -----------------------------------------------------------------------
  * ascii.h
  *
- * $Id: ascii.h,v 1.6 2001/10/25 05:50:10 momjian Exp $
+ * $Id: ascii.h,v 1.7 2001/10/28 06:26:09 momjian Exp $
  *
  *	 Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
  *
@@ -23,4 +23,5 @@ extern Datum to_ascii_default(PG_FUNCTION_ARGS);
 extern char *pg_to_ascii(unsigned char *src, unsigned char *src_end,
 			unsigned char *desc, int enc);
 #endif	 /* MULTIBYTE */
+
 #endif	 /* _ASCII_H_ */
diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h
index 82df884b697..0d88ef96399 100644
--- a/src/include/utils/bit.h
+++ b/src/include/utils/bit.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bit.h,v 1.10 2001/10/25 05:50:10 momjian Exp $
+ * $Id: bit.h,v 1.11 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,4 +34,5 @@ extern void BitArrayClearBit(BitArray bitArray, BitIndex bitIndex);
  *		True iff the bit is set (1) in a bit array.
  */
 extern bool BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex);
+
 #endif	 /* BIT_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 006b1286f8e..fdcc877538e 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.169 2001/10/25 05:50:10 momjian Exp $
+ * $Id: builtins.h,v 1.170 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -607,4 +607,5 @@ extern int32 type_maximum_size(Oid type_oid, int32 typemod);
 /* quote.c */
 extern Datum quote_ident(PG_FUNCTION_ARGS);
 extern Datum quote_literal(PG_FUNCTION_ARGS);
+
 #endif	 /* BUILTINS_H */
diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h
index 49a70616e7b..07897fb0a5c 100644
--- a/src/include/utils/cash.h
+++ b/src/include/utils/cash.h
@@ -45,4 +45,5 @@ extern Datum cashlarger(PG_FUNCTION_ARGS);
 extern Datum cashsmaller(PG_FUNCTION_ARGS);
 
 extern Datum cash_words(PG_FUNCTION_ARGS);
+
 #endif	 /* CASH_H */
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 18fd9473e49..00e4e5afe89 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.35 2001/10/25 05:50:10 momjian Exp $
+ * $Id: catcache.h,v 1.36 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -102,4 +102,5 @@ extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex,
 extern void PrepareToInvalidateCacheTuple(Relation relation,
 							  HeapTuple tuple,
 						void (*function) (int, Index, ItemPointer, Oid));
+
 #endif	 /* CATCACHE_H */
diff --git a/src/include/utils/date.h b/src/include/utils/date.h
index 9773d40768f..dc83746acfa 100644
--- a/src/include/utils/date.h
+++ b/src/include/utils/date.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: date.h,v 1.15 2001/10/25 05:50:10 momjian Exp $
+ * $Id: date.h,v 1.16 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -123,4 +123,5 @@ extern Datum timetz_zone(PG_FUNCTION_ARGS);
 extern Datum timetz_izone(PG_FUNCTION_ARGS);
 extern Datum timetz_pl_interval(PG_FUNCTION_ARGS);
 extern Datum timetz_mi_interval(PG_FUNCTION_ARGS);
+
 #endif	 /* DATE_H */
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index 57960c7699f..31d43636dc9 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datetime.h,v 1.24 2001/10/25 05:50:10 momjian Exp $
+ * $Id: datetime.h,v 1.25 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -281,4 +281,5 @@ extern int	DecodeUnits(int field, char *lowtoken, int *val);
 extern void ClearDateCache(bool);
 
 extern int	j2day(int jd);
+
 #endif	 /* DATETIME_H */
diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h
index 7f6e1662e56..f67c3ae7a6e 100644
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datum.h,v 1.14 2001/10/25 05:50:10 momjian Exp $
+ * $Id: datum.h,v 1.15 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,4 +45,5 @@ extern void datumFree(Datum value, bool typByVal, int typLen);
  */
 extern bool datumIsEqual(Datum value1, Datum value2,
 			 bool typByVal, int typLen);
+
 #endif	 /* DATUM_H */
diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h
index 549fd878c40..7c1ec1ae986 100644
--- a/src/include/utils/dynahash.h
+++ b/src/include/utils/dynahash.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynahash.h,v 1.9 2001/10/25 05:50:10 momjian Exp $
+ * $Id: dynahash.h,v 1.10 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,4 +15,5 @@
 #define DYNAHASH_H
 
 extern int	my_log2(long num);
+
 #endif	 /* DYNAHASH_H */
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index cf685ba7454..7bf248229a0 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynamic_loader.h,v 1.18 2001/10/25 05:50:10 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.19 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,4 +21,5 @@ extern void *pg_dlopen(char *filename);
 extern PGFunction pg_dlsym(void *handle, char *funcname);
 extern void pg_dlclose(void *handle);
 extern char *pg_dlerror(void);
+
 #endif	 /* DYNAMIC_LOADER_H */
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 83309a285ad..9f537932b78 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: elog.h,v 1.28 2001/10/25 05:50:10 momjian Exp $
+ * $Id: elog.h,v 1.29 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,4 +40,5 @@ elog(int lev, const char *fmt,...)
 __attribute__((format(printf, 2, 3)));
 
 extern int	DebugFileOpen(void);
+
 #endif	 /* ELOG_H */
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index e8d90c432da..b4d841e3017 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: exc.h,v 1.20 2001/10/25 05:50:10 momjian Exp $
+ * $Id: exc.h,v 1.21 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -84,4 +84,5 @@ extern void ExcRaise(Exception *excP,
  */
 extern void ExcAbort(const Exception *excP, ExcDetail detail, ExcData data,
 		 ExcMessage message);
+
 #endif	 /* EXC_H */
diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h
index db1189842e6..8259b7a888e 100644
--- a/src/include/utils/excid.h
+++ b/src/include/utils/excid.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: excid.h,v 1.11 2001/10/25 05:50:10 momjian Exp $
+ * $Id: excid.h,v 1.12 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,4 +27,5 @@ extern DLLIMPORT Exception InternalError;		/* XXX inconsistent naming
 extern DLLIMPORT Exception SemanticError;		/* XXX inconsistent naming
 												 * style */
 extern DLLIMPORT Exception SystemError; /* XXX inconsistent naming style */
+
 #endif	 /* EXCID_H */
diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h
index 04a7728bb53..e46eb90fe30 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache.h,v 1.18 2001/10/25 05:50:10 momjian Exp $
+ * $Id: fcache.h,v 1.19 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,4 +66,5 @@ typedef struct FunctionCache
 
 extern FunctionCachePtr init_fcache(Oid foid, int nargs,
 			MemoryContext fcacheCxt);
+
 #endif	 /* FCACHE_H */
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index afef186e274..e0c7852d394 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fmgrtab.h,v 1.17 2001/10/25 05:50:10 momjian Exp $
+ * $Id: fmgrtab.h,v 1.18 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,5 +35,6 @@ typedef struct
 
 extern const FmgrBuiltin fmgr_builtins[];
 
-extern const int fmgr_nbuiltins;		/* number of entries in table */
+extern const int fmgr_nbuiltins;	/* number of entries in table */
+
 #endif	 /* FMGRTAB_H */
diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h
index 2fd297c9780..85aa54e62d2 100644
--- a/src/include/utils/formatting.h
+++ b/src/include/utils/formatting.h
@@ -2,7 +2,7 @@
 /* -----------------------------------------------------------------------
  * formatting.h
  *
- * $Id: formatting.h,v 1.10 2001/10/25 05:50:10 momjian Exp $
+ * $Id: formatting.h,v 1.11 2001/10/28 06:26:09 momjian Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
@@ -32,4 +32,5 @@ extern Datum int4_to_char(PG_FUNCTION_ARGS);
 extern Datum int8_to_char(PG_FUNCTION_ARGS);
 extern Datum float4_to_char(PG_FUNCTION_ARGS);
 extern Datum float8_to_char(PG_FUNCTION_ARGS);
+
 #endif
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index 7518c351be0..52171db1523 100644
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geo_decls.h,v 1.35 2001/10/25 05:50:10 momjian Exp $
+ * $Id: geo_decls.h,v 1.36 2001/10/28 06:26:09 momjian Exp $
  *
  * NOTE
  *	  These routines do *not* use the float types from adt/.
@@ -397,4 +397,5 @@ extern Datum positionsel(PG_FUNCTION_ARGS);
 extern Datum positionjoinsel(PG_FUNCTION_ARGS);
 extern Datum contsel(PG_FUNCTION_ARGS);
 extern Datum contjoinsel(PG_FUNCTION_ARGS);
+
 #endif	 /* GEO_DECLS_H */
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index ecb883d105e..c75eda18c98 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -4,7 +4,7 @@
  * External declarations pertaining to backend/utils/misc/guc.c and
  * backend/utils/misc/guc-file.l
  *
- * $Id: guc.h,v 1.11 2001/10/25 05:50:10 momjian Exp $
+ * $Id: guc.h,v 1.12 2001/10/28 06:26:09 momjian Exp $
  */
 #ifndef GUC_H
 #define GUC_H
@@ -39,11 +39,11 @@
  */
 typedef enum
 {
-				PGC_POSTMASTER,
-				PGC_SIGHUP,
-				PGC_BACKEND,
-				PGC_SUSET,
-				PGC_USERSET
+	PGC_POSTMASTER,
+	PGC_SIGHUP,
+	PGC_BACKEND,
+	PGC_SUSET,
+	PGC_USERSET
 } GucContext;
 
 
@@ -72,4 +72,5 @@ extern bool Show_btree_build_stats;
 
 extern bool SQL_inheritance;
 extern bool Australian_timezones;
+
 #endif	 /* GUC_H */
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index 78ecc485caf..b8cbab43634 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hsearch.h,v 1.23 2001/10/25 05:50:10 momjian Exp $
+ * $Id: hsearch.h,v 1.24 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,9 +31,9 @@
  * tables, the initial directory size can be left at the default.
  */
 #define DEF_SEGSIZE			   256
-#define DEF_SEGSIZE_SHIFT	   8/* must be log2(DEF_SEGSIZE) */
+#define DEF_SEGSIZE_SHIFT	   8	/* must be log2(DEF_SEGSIZE) */
 #define DEF_DIRSIZE			   256
-#define DEF_FFACTOR			   1/* default fill factor */
+#define DEF_FFACTOR			   1	/* default fill factor */
 
 #define PRIME1				   37		/* for the hash function */
 #define PRIME2				   1048583
@@ -87,7 +87,7 @@ typedef struct HTAB
 	HASHHDR    *hctl;			/* shared control information */
 	HASHSEGMENT *dir;			/* directory of segment starts */
 	long		(*hash) (void *key, int keysize);		/* Hash Function */
-	void	   *(*alloc) (Size);		/* memory allocator */
+	void	   *(*alloc) (Size);	/* memory allocator */
 	MemoryContext hcxt;			/* memory context if default allocator
 								 * used */
 	char	   *tabname;		/* table name (for error messages) */
@@ -106,7 +106,7 @@ typedef struct HASHCTL
 	long		entrysize;		/* total user element size in bytes */
 	long		max_dsize;		/* limit to dsize if directory size is
 								 * limited */
-	void	   *(*alloc) (Size);		/* memory allocation function */
+	void	   *(*alloc) (Size);	/* memory allocation function */
 	HASHSEGMENT *dir;			/* directory of segment starts */
 	HASHHDR    *hctl;			/* location of header in shared mem */
 	MemoryContext hcxt;			/* memory context to use for allocations */
@@ -132,11 +132,11 @@ typedef struct HASHCTL
 /* hash_search operations */
 typedef enum
 {
-				HASH_FIND,
-				HASH_ENTER,
-				HASH_REMOVE,
-				HASH_FIND_SAVE,
-				HASH_REMOVE_SAVED
+	HASH_FIND,
+	HASH_ENTER,
+	HASH_REMOVE,
+	HASH_FIND_SAVE,
+	HASH_REMOVE_SAVED
 } HASHACTION;
 
 /* hash_seq status (should be considered an opaque type by callers) */
@@ -166,4 +166,5 @@ extern long hash_select_dirsize(long num_entries);
  */
 extern long string_hash(void *key, int keysize);
 extern long tag_hash(void *key, int keysize);
+
 #endif	 /* HSEARCH_H */
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index d083fb9f002..252a9ece7a4 100644
--- a/src/include/utils/int8.h
+++ b/src/include/utils/int8.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: int8.h,v 1.29 2001/10/25 14:10:07 tgl Exp $
+ * $Id: int8.h,v 1.30 2001/10/28 06:26:09 momjian Exp $
  *
  * NOTES
  * These data types are supported on all 64-bit architectures, and may
@@ -106,4 +106,5 @@ extern Datum dtoi8(PG_FUNCTION_ARGS);
 
 extern Datum int8_text(PG_FUNCTION_ARGS);
 extern Datum text_int8(PG_FUNCTION_ARGS);
+
 #endif	 /* INT8_H */
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index bc5b8d7fbe2..e025cc216fb 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.21 2001/10/25 05:50:10 momjian Exp $
+ * $Id: inval.h,v 1.22 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,4 +26,5 @@ extern void CommandEndInvalidationMessages(bool isCommit);
 extern void RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple);
 
 extern void RelationMark4RollbackHeapTuple(Relation relation, HeapTuple tuple);
+
 #endif	 /* INVAL_H */
diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h
index 960a2d3abec..721a065dd3d 100644
--- a/src/include/utils/logtape.h
+++ b/src/include/utils/logtape.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: logtape.h,v 1.5 2001/10/25 05:50:10 momjian Exp $
+ * $Id: logtape.h,v 1.6 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,4 +38,5 @@ extern bool LogicalTapeSeek(LogicalTapeSet *lts, int tapenum,
 				long blocknum, int offset);
 extern void LogicalTapeTell(LogicalTapeSet *lts, int tapenum,
 				long *blocknum, int *offset);
+
 #endif	 /* LOGTAPE_H */
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 17e9c510686..ad5409ff088 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.37 2001/10/25 05:50:10 momjian Exp $
+ * $Id: lsyscache.h,v 1.38 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,4 +56,5 @@ extern void free_attstatsslot(Oid atttype,
 extern int32 get_usesysid(const char *username);
 
 #define TypeIsToastable(typid)	(get_typstorage(typid) != 'p')
+
 #endif	 /* LSYSCACHE_H */
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 03bb3b6e9f5..3f2ed80dd31 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nabstime.h,v 1.33 2001/10/25 05:50:10 momjian Exp $
+ * $Id: nabstime.h,v 1.34 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -159,4 +159,5 @@ extern Datum timeofday(PG_FUNCTION_ARGS);
 extern AbsoluteTime GetCurrentAbsoluteTime(void);
 extern AbsoluteTime GetCurrentAbsoluteTimeUsec(int *usec);
 extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char **tzn);
+
 #endif	 /* NABSTIME_H */
diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h
index 1198b838ae3..eda8d18d076 100644
--- a/src/include/utils/numeric.h
+++ b/src/include/utils/numeric.h
@@ -5,7 +5,7 @@
  *
  *	1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.13 2001/10/25 05:50:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.14 2001/10/28 06:26:09 momjian Exp $
  *
  * ----------
  */
@@ -81,4 +81,5 @@ typedef NumericData *Numeric;
 #define PG_GETARG_NUMERIC(n)	  DatumGetNumeric(PG_GETARG_DATUM(n))
 #define PG_GETARG_NUMERIC_COPY(n) DatumGetNumericCopy(PG_GETARG_DATUM(n))
 #define PG_RETURN_NUMERIC(x)	  return NumericGetDatum(x)
+
 #endif	 /* _PG_NUMERIC_H_ */
diff --git a/src/include/utils/pg_crc.h b/src/include/utils/pg_crc.h
index e6d4b223fc8..a1e1da7340d 100644
--- a/src/include/utils/pg_crc.h
+++ b/src/include/utils/pg_crc.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_crc.h,v 1.4 2001/10/25 05:50:10 momjian Exp $
+ * $Id: pg_crc.h,v 1.5 2001/10/28 06:26:09 momjian Exp $
  */
 #ifndef PG_CRC_H
 #define PG_CRC_H
@@ -117,4 +117,5 @@ do { \
 /* Constant table for CRC calculation */
 extern const uint64 crc_table[];
 #endif	 /* INT64_IS_BUSTED */
+
 #endif	 /* PG_CRC_H */
diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h
index a2a727290a8..d3d16d9780d 100644
--- a/src/include/utils/pg_locale.h
+++ b/src/include/utils/pg_locale.h
@@ -4,7 +4,7 @@
  *	 The PostgreSQL locale utils.
  *
  *
- * $Id: pg_locale.h,v 1.9 2001/10/25 05:50:10 momjian Exp $
+ * $Id: pg_locale.h,v 1.10 2001/10/28 06:26:09 momjian Exp $
  *
  *	 Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
  *
@@ -51,6 +51,6 @@ extern void PGLC_free_categories(PG_LocaleCategories *lc);
  *------
  */
 extern struct lconv *PGLC_localeconv(void);
-
 #endif	 /* USE_LOCALE */
+
 #endif	 /* _PG_LOCALE_ */
diff --git a/src/include/utils/pg_lzcompress.h b/src/include/utils/pg_lzcompress.h
index deaa8b1fb21..bc6dd8c3e04 100644
--- a/src/include/utils/pg_lzcompress.h
+++ b/src/include/utils/pg_lzcompress.h
@@ -1,7 +1,7 @@
 /* ----------
  * pg_lzcompress.h -
  *
- * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.6 2001/10/25 05:50:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.7 2001/10/28 06:26:09 momjian Exp $
  *
  *	Definitions for the builtin LZ compressor
  * ----------
@@ -227,4 +227,5 @@ int			pglz_decompress(PGLZ_Header *source, char *dest);
  */
 extern int	pglz_get_next_decomp_char_from_lzdata(PGLZ_DecompState *dstate);
 extern int	pglz_get_next_decomp_char_from_plain(PGLZ_DecompState *dstate);
+
 #endif	 /* _PG_LZCOMPRESS_H_ */
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index 94b8e0911d2..8b12856e33d 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -4,7 +4,7 @@
  *
  * Declarations for backend/utils/misc/ps_status.c
  *
- * $Id: ps_status.h,v 1.21 2001/10/25 05:50:10 momjian Exp $
+ * $Id: ps_status.h,v 1.22 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,4 +20,5 @@ extern void init_ps_display(const char *username, const char *dbname,
 extern void set_ps_display(const char *activity);
 
 extern const char *get_ps_display(void);
+
 #endif	 /* PS_STATUS_H */
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 11c06069aa0..1e450d5e731 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.53 2001/10/25 05:50:10 momjian Exp $
+ * $Id: rel.h,v 1.54 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -279,4 +279,5 @@ typedef Relation *RelationPtr;
 
 /* added to prevent circular dependency.  bjm 1999/11/15 */
 extern char *get_temp_rel_by_physicalname(const char *relname);
+
 #endif	 /* REL_H */
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index d4243c7c121..6906520107f 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relcache.h,v 1.27 2001/10/25 05:50:11 momjian Exp $
+ * $Id: relcache.h,v 1.28 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -72,4 +72,5 @@ extern void DestroyDummyCaches(void);
  */
 
 #define RELCACHE_INIT_FILENAME	"pg_internal.init"
+
 #endif	 /* RELCACHE_H */
diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
index 5a7c44a6c6b..9e7d5ac5dab 100644
--- a/src/include/utils/selfuncs.h
+++ b/src/include/utils/selfuncs.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: selfuncs.h,v 1.2 2001/10/25 05:50:11 momjian Exp $
+ * $Id: selfuncs.h,v 1.3 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,13 +21,13 @@
 
 typedef enum
 {
-				Pattern_Type_Like, Pattern_Type_Like_IC,
-				Pattern_Type_Regex, Pattern_Type_Regex_IC
+	Pattern_Type_Like, Pattern_Type_Like_IC,
+	Pattern_Type_Regex, Pattern_Type_Regex_IC
 } Pattern_Type;
 
 typedef enum
 {
-				Pattern_Prefix_None, Pattern_Prefix_Partial, Pattern_Prefix_Exact
+	Pattern_Prefix_None, Pattern_Prefix_Partial, Pattern_Prefix_Exact
 } Pattern_Prefix_Status;
 
 
@@ -73,4 +73,5 @@ extern Datum btcostestimate(PG_FUNCTION_ARGS);
 extern Datum rtcostestimate(PG_FUNCTION_ARGS);
 extern Datum hashcostestimate(PG_FUNCTION_ARGS);
 extern Datum gistcostestimate(PG_FUNCTION_ARGS);
+
 #endif	 /* SELFUNCS_H */
diff --git a/src/include/utils/sets.h b/src/include/utils/sets.h
index b620967b01a..07c827c03ba 100644
--- a/src/include/utils/sets.h
+++ b/src/include/utils/sets.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sets.h,v 1.10 2001/10/25 05:50:11 momjian Exp $
+ * $Id: sets.h,v 1.11 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,4 +23,5 @@
 extern Oid	SetDefine(char *querystr, char *typename);
 
 extern Datum seteval(PG_FUNCTION_ARGS);
+
 #endif	 /* SETS_H */
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index e21081cc1ef..2ec1986e671 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.34 2001/10/25 05:50:11 momjian Exp $
+ * $Id: syscache.h,v 1.35 2001/10/28 06:26:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -72,4 +72,5 @@ extern Oid GetSysCacheOid(int cacheId,
 
 extern Datum SysCacheGetAttr(int cacheId, HeapTuple tup,
 				AttrNumber attributeNumber, bool *isNull);
+
 #endif	 /* SYSCACHE_H */
diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h
index 20dc75f9e97..fa3ed41cf32 100644
--- a/src/include/utils/temprel.h
+++ b/src/include/utils/temprel.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: temprel.h,v 1.18 2001/10/25 05:50:11 momjian Exp $
+ * $Id: temprel.h,v 1.19 2001/10/28 06:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,4 +29,5 @@ extern char *get_temp_rel_by_username(const char *user_relname);
 extern char *get_temp_rel_by_physicalname(const char *relname);
 
 #define is_temp_rel_name(relname) (get_temp_rel_by_username(relname) != NULL)
+
 #endif	 /* TEMPREL_H */
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index 2272c33ff2d..3ac252b8cad 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: timestamp.h,v 1.22 2001/10/25 05:50:11 momjian Exp $
+ * $Id: timestamp.h,v 1.23 2001/10/28 06:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -180,4 +180,5 @@ extern void GetEpochTime(struct tm * tm);
 
 extern void isoweek2date(int woy, int *year, int *mon, int *mday);
 extern int	date2isoweek(int year, int mon, int mday);
+
 #endif	 /* TIMESTAMP_H */
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 4ebcc094d78..5a6c832fddc 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tqual.h,v 1.35 2001/10/25 05:50:11 momjian Exp $
+ * $Id: tqual.h,v 1.36 2001/10/28 06:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -90,14 +90,12 @@ extern bool ReferentialIntegritySnapshotOverride;
 /* Result codes for HeapTupleSatisfiesVacuum */
 typedef enum
 {
-				HEAPTUPLE_DEAD, /* tuple is dead and deletable */
-				HEAPTUPLE_LIVE, /* tuple is live (committed, no deleter) */
-				HEAPTUPLE_RECENTLY_DEAD,		/* tuple is dead, but not
-												 * deletable yet */
-				HEAPTUPLE_INSERT_IN_PROGRESS,	/* inserting xact is still
-												 * in progress */
-				HEAPTUPLE_DELETE_IN_PROGRESS	/* deleting xact is still
-												 * in progress */
+	HEAPTUPLE_DEAD,				/* tuple is dead and deletable */
+	HEAPTUPLE_LIVE,				/* tuple is live (committed, no deleter) */
+	HEAPTUPLE_RECENTLY_DEAD,	/* tuple is dead, but not deletable yet */
+	HEAPTUPLE_INSERT_IN_PROGRESS,		/* inserting xact is still in
+										 * progress */
+	HEAPTUPLE_DELETE_IN_PROGRESS	/* deleting xact is still in progress */
 } HTSV_Result;
 
 extern bool HeapTupleSatisfiesItself(HeapTupleHeader tuple);
@@ -112,4 +110,5 @@ extern HTSV_Result HeapTupleSatisfiesVacuum(HeapTupleHeader tuple,
 extern Snapshot GetSnapshotData(bool serializable);
 extern void SetQuerySnapshot(void);
 extern void FreeXactSnapshot(void);
+
 #endif	 /* TQUAL_H */
diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h
index 11137219288..f6baea7412a 100644
--- a/src/include/utils/tuplesort.h
+++ b/src/include/utils/tuplesort.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuplesort.h,v 1.9 2001/10/25 05:50:11 momjian Exp $
+ * $Id: tuplesort.h,v 1.10 2001/10/28 06:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -83,10 +83,10 @@ extern void tuplesort_restorepos(Tuplesortstate *state);
  */
 typedef enum
 {
-				SORTFUNC_LT,	/* raw "<" operator */
-				SORTFUNC_REVLT, /* raw "<" operator, but reverse NULLs */
-				SORTFUNC_CMP,	/* -1 / 0 / 1 three-way comparator */
-				SORTFUNC_REVCMP /* 1 / 0 / -1 (reversed) 3-way comparator */
+	SORTFUNC_LT,				/* raw "<" operator */
+	SORTFUNC_REVLT,				/* raw "<" operator, but reverse NULLs */
+	SORTFUNC_CMP,				/* -1 / 0 / 1 three-way comparator */
+	SORTFUNC_REVCMP				/* 1 / 0 / -1 (reversed) 3-way comparator */
 } SortFunctionKind;
 
 extern void SelectSortFunction(Oid sortOperator,
@@ -101,4 +101,5 @@ extern void SelectSortFunction(Oid sortOperator,
 extern int32 ApplySortFunction(FmgrInfo *sortFunction, SortFunctionKind kind,
 				  Datum datum1, bool isNull1,
 				  Datum datum2, bool isNull2);
+
 #endif	 /* TUPLESORT_H */
diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h
index 39d17461085..1e253d178b4 100644
--- a/src/include/utils/tuplestore.h
+++ b/src/include/utils/tuplestore.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuplestore.h,v 1.4 2001/10/25 05:50:11 momjian Exp $
+ * $Id: tuplestore.h,v 1.5 2001/10/28 06:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,4 +56,5 @@ extern void tuplestore_end(Tuplestorestate *state);
 extern void tuplestore_rescan(Tuplestorestate *state);
 extern void tuplestore_markpos(Tuplestorestate *state);
 extern void tuplestore_restorepos(Tuplestorestate *state);
+
 #endif	 /* TUPLESTORE_H */
diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h
index b4fedf18a77..27d1c4fa8fc 100644
--- a/src/include/utils/varbit.h
+++ b/src/include/utils/varbit.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: varbit.h,v 1.12 2001/10/25 05:50:11 momjian Exp $
+ * $Id: varbit.h,v 1.13 2001/10/28 06:26:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -89,4 +89,5 @@ extern Datum bitoctetlength(PG_FUNCTION_ARGS);
 extern Datum bitfromint4(PG_FUNCTION_ARGS);
 extern Datum bittoint4(PG_FUNCTION_ARGS);
 extern Datum bitposition(PG_FUNCTION_ARGS);
+
 #endif