OK, folks, here is the pgindent output.

38 files changed, 174 insertions, 202 deletions

diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 6ebd5baf718..93c896320a1 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: acl.h,v 1.17 1998/02/26 04:43:43 momjian Exp $
+ * $Id: acl.h,v 1.18 1998/09/01 04:38:48 momjian Exp $
  *
  * NOTES
  *	  For backward-compatability purposes we have to allow there
@@ -141,8 +141,7 @@ extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg);
 
 extern char *aclmakepriv(char *old_privlist, char new_priv);
 extern char *aclmakeuser(char *user_type, char *user);
-extern ChangeACLStmt *
-makeAclStmt(char *privs, List *rel_list, char *grantee,
+extern ChangeACLStmt *makeAclStmt(char *privs, List *rel_list, char *grantee,
 			char grant_or_revoke);
 
 /*
@@ -164,11 +163,9 @@ extern char *get_groname(AclId grosysid);
 
 extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode);
 extern int32 pg_ownercheck(char *usename, char *value, int cacheid);
-extern int32
-pg_func_ownercheck(char *usename, char *funcname,
+extern int32 pg_func_ownercheck(char *usename, char *funcname,
 				   int nargs, Oid *arglist);
-extern int32
-pg_aggr_ownercheck(char *usename, char *aggname,
+extern int32 pg_aggr_ownercheck(char *usename, char *aggname,
 				   Oid basetypeID);
 
-#endif							/* ACL_H */
+#endif	 /* ACL_H */
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index fb7beef36a7..6052a8cfcc4 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.13 1998/09/01 03:28:26 momjian Exp $
+ * $Id: array.h,v 1.14 1998/09/01 04:38:50 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -117,22 +117,17 @@ typedef struct
 extern char *array_in(char *string, Oid element_type, int32 typmod);
 extern char *array_out(ArrayType *v, Oid element_type);
 extern char *array_dims(ArrayType *v, bool *isNull);
-extern Datum
-array_ref(ArrayType *array, int n, int *indx, int reftype,
+extern Datum array_ref(ArrayType *array, int n, int *indx, int reftype,
 		  int elmlen, int arraylen, bool *isNull);
-extern Datum
-array_clip(ArrayType *array, int n, int *upperIndx,
+extern Datum array_clip(ArrayType *array, int n, int *upperIndx,
 		   int *lowerIndx, int reftype, int len, bool *isNull);
-extern char *
-array_set(ArrayType *array, int n, int *indx, char *dataPtr,
+extern char *array_set(ArrayType *array, int n, int *indx, char *dataPtr,
 		  int reftype, int elmlen, int arraylen, bool *isNull);
-extern char *
-array_assgn(ArrayType *array, int n, int *upperIndx,
+extern char *array_assgn(ArrayType *array, int n, int *upperIndx,
 			int *lowerIndx, ArrayType *newArr, int reftype,
 			int len, bool *isNull);
 extern int	array_eq(ArrayType *array1, ArrayType *array2);
-extern int
-_LOtransfer(char **destfd, int size, int nitems, char **srcfd,
+extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd,
 			int isSrcLO, int isDestLO);
 
 extern char *_array_newLO(int *fd, int flag);
@@ -156,15 +151,12 @@ extern int	next_tuple(int n, int *curr, int *span);
 /*
  * prototypes for functions defined in chunk.c
  */
-extern char *
-_ChunkArray(int fd, FILE *afd, int ndim, int *dim, int baseSize,
+extern char *_ChunkArray(int fd, FILE *afd, int ndim, int *dim, int baseSize,
 			int *nbytes, char *chunkfile);
-extern int
-_ReadChunkArray(int *st, int *endp, int bsize, int fp,
+extern int _ReadChunkArray(int *st, int *endp, int bsize, int fp,
 			 char *destfp, ArrayType *array, int isDestLO, bool *isNull);
-extern struct varlena *
-_ReadChunkArray1El(int *st, int bsize, int fp,
+extern struct varlena *_ReadChunkArray1El(int *st, int bsize, int fp,
 				   ArrayType *array, bool *isNull);
 
 
-#endif							/* ARRAY_H */
+#endif	 /* ARRAY_H */
diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h
index e8235b5a3a3..ef060dbb115 100644
--- a/src/include/utils/bit.h
+++ b/src/include/utils/bit.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bit.h,v 1.3 1997/09/08 02:39:29 momjian Exp $
+ * $Id: bit.h,v 1.4 1998/09/01 04:38:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,4 +36,4 @@ extern void BitArrayClearBit(BitArray bitArray, BitIndex bitIndex);
  */
 extern bool BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex);
 
-#endif							/* BIT_H */
+#endif	 /* BIT_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 931e17f2bd7..f10914a6b7c 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.50 1998/09/01 03:28:28 momjian Exp $
+ * $Id: builtins.h,v 1.51 1998/09/01 04:38:52 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
  *	  Under no circumstances should it ever be included before
  *	  including fmgr.h!
  * fmgr.h does not seem to include this file, so don't know where this
- *  comment came from. Backend code must include this stuff explicitly
- *  as far as I can tell...
+ *	comment came from. Backend code must include this stuff explicitly
+ *	as far as I can tell...
  * - thomas 1998-06-08
  *
  *-------------------------------------------------------------------------
@@ -149,7 +149,7 @@ extern int	namestrcmp(Name name, char *str);
 /* XXX hack.  HP-UX has a ltoa (with different arguments) already. */
 #ifdef __hpux
 #define ltoa pg_ltoa
-#endif							/* hpux */
+#endif	 /* hpux */
 extern int32 pg_atoi(char *s, int size, int c);
 extern void itoa(int i, char *a);
 extern void ltoa(int32 l, char *a);
@@ -438,8 +438,8 @@ extern char *textout(text *vlena);
 extern text *textcat(text *arg1, text *arg2);
 extern bool texteq(text *arg1, text *arg2);
 extern bool textne(text *arg1, text *arg2);
-extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2);
-extern int text_cmp(text *arg1, text *arg2);
+extern int	varstr_cmp(char *arg1, int len1, char *arg2, int len2);
+extern int	text_cmp(text *arg1, text *arg2);
 extern bool text_lt(text *arg1, text *arg2);
 extern bool text_le(text *arg1, text *arg2);
 extern bool text_gt(text *arg1, text *arg2);
@@ -511,4 +511,4 @@ extern text *translate(text *string, char from, char to);
 
 /* acl.c */
 
-#endif							/* BUILTINS_H */
+#endif	 /* BUILTINS_H */
diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h
index d9d0d0e56a9..b5e45fc8daf 100644
--- a/src/include/utils/cash.h
+++ b/src/include/utils/cash.h
@@ -46,4 +46,4 @@ extern Cash *cashsmaller(Cash *c1, Cash *c2);
 
 extern const char *cash_words_out(Cash *value);
 
-#endif							/* CASH_H */
+#endif	 /* CASH_H */
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index e955c29f3df..159f6387b05 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.12 1998/09/01 03:28:29 momjian Exp $
+ * $Id: catcache.h,v 1.13 1998/09/01 04:38:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,19 +63,15 @@ typedef struct catcache
 extern struct catcache *Caches;
 extern GlobalMemory CacheCxt;
 
-extern void
-CatalogCacheIdInvalidate(int cacheId, Index hashIndex,
+extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex,
 						 ItemPointer pointer);
 extern void ResetSystemCache(void);
 extern void SystemCacheRelationFlushed(Oid relId);
-extern CatCache *
-InitSysCache(char *relname, char *indname, int id, int nkeys,
+extern CatCache *InitSysCache(char *relname, char *indname, int id, int nkeys,
 			 int *key, HeapTuple (*iScanfuncP) ());
-extern HeapTuple
-SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
+extern HeapTuple SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
 			   Datum v3, Datum v4);
-extern void
-RelationInvalidateCatalogCacheTuple(Relation relation,
+extern void RelationInvalidateCatalogCacheTuple(Relation relation,
 									HeapTuple tuple, void (*function) ());
 
-#endif							/* CATCACHE_H */
+#endif	 /* CATCACHE_H */
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index 4c0cefce8fc..7248af64d5f 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datetime.h,v 1.5 1997/09/08 02:39:35 momjian Exp $
+ * $Id: datetime.h,v 1.6 1998/09/01 04:38:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,4 +19,4 @@ typedef int32 DateADT;
 
 typedef float8 TimeADT;
 
-#endif							/* DATETIME_H */
+#endif	 /* DATETIME_H */
diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h
index ab394e7fcd6..bd5c6eac8d7 100644
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datum.h,v 1.7 1998/02/26 04:43:57 momjian Exp $
+ * $Id: datum.h,v 1.8 1998/09/01 04:38:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,8 +57,7 @@ extern void datumFree(Datum value, Oid type, bool byVal, Size len);
  * return true if thwo datums are equal, false otherwise.
  * XXX : See comments in the code for restrictions!
  */
-extern bool
-datumIsEqual(Datum value1, Datum value2, Oid type,
+extern bool datumIsEqual(Datum value1, Datum value2, Oid type,
 			 bool byVal, Size len);
 
-#endif							/* DATUM_H */
+#endif	 /* DATUM_H */
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index 0e947d63932..10c229beb6a 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.31 1998/09/01 03:28:30 momjian Exp $
+ * $Id: dt.h,v 1.32 1998/09/01 04:38:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -194,7 +194,7 @@ typedef struct
 	char	   *token;
 #else
 	char		token[TOKMAXLEN];
-#endif							/* _AIX */
+#endif	 /* _AIX */
 	char		type;
 	char		value;			/* this may be unsigned, alas */
 } datetkn;
@@ -323,19 +323,15 @@ extern int	date2j(int year, int month, int day);
 
 extern double time2t(const int hour, const int min, const double sec);
 
-extern int
-ParseDateTime(char *timestr, char *lowstr,
+extern int ParseDateTime(char *timestr, char *lowstr,
 			  char **field, int *ftype, int maxfields, int *numfields);
-extern int
-DecodeDateTime(char **field, int *ftype,
+extern int DecodeDateTime(char **field, int *ftype,
 			 int nf, int *dtype, struct tm * tm, double *fsec, int *tzp);
 
-extern int
-DecodeTimeOnly(char **field, int *ftype, int nf,
+extern int DecodeTimeOnly(char **field, int *ftype, int nf,
 			   int *dtype, struct tm * tm, double *fsec);
 
-extern int
-DecodeDateDelta(char **field, int *ftype,
+extern int DecodeDateDelta(char **field, int *ftype,
 				int nf, int *dtype, struct tm * tm, double *fsec);
 
 extern int	EncodeDateOnly(struct tm * tm, int style, char *str);
@@ -343,4 +339,4 @@ extern int	EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str);
 extern int	EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str);
 extern int	EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str);
 
-#endif							/* DT_H */
+#endif	 /* DT_H */
diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h
index 6febd293cee..5b59110ccfc 100644
--- a/src/include/utils/dynahash.h
+++ b/src/include/utils/dynahash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynahash.h,v 1.4 1997/09/08 02:39:38 momjian Exp $
+ * $Id: dynahash.h,v 1.5 1998/09/01 04:39:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,4 +15,4 @@
 
 extern int	my_log2(long num);
 
-#endif							/* DYNAHASH_H */
+#endif	 /* DYNAHASH_H */
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index 13ed4174f36..8ee1639c43f 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynamic_loader.h,v 1.8 1997/09/08 21:54:56 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.9 1998/09/01 04:39:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,7 @@
 #ifdef MIN
 #undef MIN
 #undef MAX
-#endif							/* MIN */
+#endif	 /* MIN */
 
 /*
  * List of dynamically loaded files.
@@ -41,4 +41,4 @@ extern func_ptr pg_dlsym(void *handle, char *funcname);
 extern void pg_dlclose(void *handle);
 extern char *pg_dlerror(void);
 
-#endif							/* DYNAMIC_LOADER_H */
+#endif	 /* DYNAMIC_LOADER_H */
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 1b1cb016840..7d74644c620 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: elog.h,v 1.7 1998/01/07 21:06:50 momjian Exp $
+ * $Id: elog.h,v 1.8 1998/09/01 04:39:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,4 +42,4 @@ int			DebugFileOpen(void);
 
 #endif
 
-#endif							/* ELOG_H */
+#endif	 /* ELOG_H */
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index 809361c639c..365c81278ef 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: exc.h,v 1.13 1998/06/15 18:40:05 momjian Exp $
+ * $Id: exc.h,v 1.14 1998/09/01 04:39:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -83,8 +83,7 @@ typedef void ExcProc (Exception *, ExcDetail, ExcData, ExcMessage);
  * prototypes for functions in exc.c
  */
 extern void EnableExceptionHandling(bool on);
-extern void
-ExcRaise(Exception *excP,
+extern void ExcRaise(Exception *excP,
 		 ExcDetail detail,
 		 ExcData data,
 		 ExcMessage message);
@@ -93,8 +92,7 @@ ExcRaise(Exception *excP,
 /*
  * prototypes for functions in excabort.c
  */
-extern void
-ExcAbort(const Exception *excP, ExcDetail detail, ExcData data,
+extern void ExcAbort(const Exception *excP, ExcDetail detail, ExcData data,
 		 ExcMessage message);
 
-#endif							/* EXC_H */
+#endif	 /* EXC_H */
diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h
index 69636540746..98549c03451 100644
--- a/src/include/utils/excid.h
+++ b/src/include/utils/excid.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: excid.h,v 1.4 1997/09/07 05:02:29 momjian Exp $
+ * $Id: excid.h,v 1.5 1998/09/01 04:39:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,4 +26,4 @@ extern Exception InternalError; /* XXX inconsistent naming style */
 extern Exception SemanticError; /* XXX inconsistent naming style */
 extern Exception SystemError;	/* XXX inconsistent naming style */
 
-#endif							/* EXCID_H */
+#endif	 /* EXCID_H */
diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h
index 504ac8e2adb..cc6abbe41ff 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache.h,v 1.6 1998/01/15 19:46:36 pgsql Exp $
+ * $Id: fcache.h,v 1.7 1998/09/01 04:39:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,4 +54,4 @@ typedef struct
 } FunctionCache,
 		   *FunctionCachePtr;
 
-#endif							/* FCACHE_H */
+#endif	 /* FCACHE_H */
diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h
index f980dd9df8b..c7781b689ab 100644
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache2.h,v 1.6 1998/01/24 22:50:42 momjian Exp $
+ * $Id: fcache2.h,v 1.7 1998/09/01 04:39:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,4 +17,4 @@
 
 extern void setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext);
 
-#endif							/* FCACHE2_H */
+#endif	 /* FCACHE2_H */
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index 953f1811375..30376415457 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fmgrtab.h,v 1.7 1997/09/08 21:55:04 momjian Exp $
+ * $Id: fmgrtab.h,v 1.8 1998/09/01 04:39:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,4 +26,4 @@ extern FmgrCall *fmgr_isbuiltin(Oid id);
 extern func_ptr fmgr_lookupByName(char *name);
 extern void load_file(char *filename);
 
-#endif							/* FMGRTAB_H */
+#endif	 /* FMGRTAB_H */
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index 7cd7e880969..44b0d719c7e 100644
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geo_decls.h,v 1.20 1998/05/09 22:44:38 thomas Exp $
+ * $Id: geo_decls.h,v 1.21 1998/09/01 04:39:11 momjian Exp $
  *
  * NOTE
  *	  These routines do *not* use the float types from adt/.
@@ -360,11 +360,9 @@ extern double *circle_area(CIRCLE *circle);
 extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2);
 
 /* geo_selfuncs.c */
-extern float64
-areasel(Oid opid, Oid relid, AttrNumber attno,
+extern float64 areasel(Oid opid, Oid relid, AttrNumber attno,
 		char *value, int32 flag);
-extern float64
-areajoinsel(Oid opid, Oid relid, AttrNumber attno,
+extern float64 areajoinsel(Oid opid, Oid relid, AttrNumber attno,
 			char *value, int32 flag);
 
-#endif							/* GEO_DECLS_H */
+#endif	 /* GEO_DECLS_H */
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index 977a843a13f..f0a80097765 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hsearch.h,v 1.8 1998/02/26 04:44:01 momjian Exp $
+ * $Id: hsearch.h,v 1.9 1998/09/01 04:39:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -133,8 +133,7 @@ typedef enum
 extern HTAB *hash_create(int nelem, HASHCTL *info, int flags);
 extern void hash_destroy(HTAB *hashp);
 extern void hash_stats(char *where, HTAB *hashp);
-extern long *
-hash_search(HTAB *hashp, char *keyPtr, HASHACTION action,
+extern long *hash_search(HTAB *hashp, char *keyPtr, HASHACTION action,
 			bool *foundPtr);
 extern long *hash_seq(HTAB *hashp);
 
@@ -144,4 +143,4 @@ extern long *hash_seq(HTAB *hashp);
 extern long string_hash(char *key, int keysize);
 extern long tag_hash(int *key, int keysize);
 
-#endif							/* HSEARCH_H */
+#endif	 /* HSEARCH_H */
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index dff02b71206..65e8300ee44 100644
--- a/src/include/utils/int8.h
+++ b/src/include/utils/int8.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: int8.h,v 1.2 1998/08/23 22:25:54 momjian Exp $
+ * $Id: int8.h,v 1.3 1998/09/01 04:39:13 momjian Exp $
  *
  * NOTES
  * These data types are supported on all 64-bit architectures, and may
- *  be supported through libraries on some 32-bit machines. If your machine
- *  is not currently supported, then please try to make it so, then post
- *  patches to the postgresql.org hackers mailing list.
+ *	be supported through libraries on some 32-bit machines. If your machine
+ *	is not currently supported, then please try to make it so, then post
+ *	patches to the postgresql.org hackers mailing list.
  *
  * This code was written for and originally appeared in the contrib
- *  directory as a user-defined type.
+ *	directory as a user-defined type.
  * - thomas 1998-06-08
  *
  *-------------------------------------------------------------------------
@@ -26,15 +26,18 @@
 #ifdef HAVE_LONG_INT_64
 /* Plain "long int" fits, use it */
 typedef long int int64;
+
 #define INT64_FORMAT "%ld"
 #else
 #ifdef HAVE_LONG_LONG_INT_64
 /* We have working support for "long long int", use that */
 typedef long long int int64;
+
 #define INT64_FORMAT "%Ld"
 #else
 /* Won't actually work, but fall back to long int so that int8.c compiles */
 typedef long int int64;
+
 #define INT64_FORMAT "%ld"
 #define INT64_IS_BUSTED
 #endif
@@ -88,9 +91,10 @@ extern int32 int84(int64 * val);
 #if FALSE
 extern int64 *int28 (int16 val);
 extern int16 int82(int64 * val);
+
 #endif
 
 extern float64 i8tod(int64 * val);
 extern int64 *dtoi8(float64 val);
 
-#endif							/* INT8_H */
+#endif	 /* INT8_H */
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index a487e88a74b..bb2591552b3 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.8 1998/02/23 17:44:24 scrappy Exp $
+ * $Id: inval.h,v 1.9 1998/09/01 04:39:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,4 +46,4 @@ typedef InvalidationEntry LocalInvalid;
 
 #define EmptyLocalInvalid		NULL
 
-#endif							/* INVAL_H */
+#endif	 /* INVAL_H */
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index 40e8d2ba510..08fb6f3c4fc 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.10 1998/02/26 04:44:06 momjian Exp $
+ * $Id: lselect.h,v 1.11 1998/09/01 04:39:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,14 +39,11 @@ typedef struct
 } LeftistContextData;
 typedef LeftistContextData *LeftistContext;
 
-extern struct leftist *
-lmerge(struct leftist * pt, struct leftist * qt,
+extern struct leftist *lmerge(struct leftist * pt, struct leftist * qt,
 	   LeftistContext context);
-extern HeapTuple
-gettuple(struct leftist ** treep, short *devnum,
+extern HeapTuple gettuple(struct leftist ** treep, short *devnum,
 		 LeftistContext context);
-extern void
-puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum,
+extern void puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum,
 		 LeftistContext context);
 extern int	tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context);
 
@@ -54,6 +51,6 @@ extern int	tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context);
 extern void checktree(struct leftist * tree, LeftistContext context);
 extern int	checktreer(struct leftist * tree, int level, LeftistContext context);
 
-#endif							/* EBUG */
+#endif	 /* EBUG */
 
-#endif							/* LSELECT_H */
+#endif	 /* LSELECT_H */
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 0d8816da4e4..0fd7ad7c796 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.14 1998/08/11 14:32:03 momjian Exp $
+ * $Id: lsyscache.h,v 1.15 1998/09/01 04:39:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,8 +24,7 @@ extern bool get_attisset(Oid relid, char *attname);
 extern int32 get_atttypmod(Oid relid, AttrNumber attnum);
 extern RegProcedure get_opcode(Oid opid);
 extern char *get_opname(Oid opid);
-extern bool
-op_mergejoinable(Oid opid, Oid ltype, Oid rtype,
+extern bool op_mergejoinable(Oid opid, Oid ltype, Oid rtype,
 				 Oid *leftOp, Oid *rightOp);
 extern Oid	op_hashjoinable(Oid opid, Oid ltype, Oid rtype);
 extern Oid	get_commutator(Oid opid);
@@ -42,4 +41,4 @@ extern int16 get_typlen(Oid typid);
 extern bool get_typbyval(Oid typid);
 extern struct varlena *get_typdefault(Oid typid);
 
-#endif							/* LSYSCACHE_H */
+#endif	 /* LSYSCACHE_H */
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index 44427d65b64..d4cc427422c 100644
--- a/src/include/utils/mcxt.h
+++ b/src/include/utils/mcxt.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: mcxt.h,v 1.10 1998/02/26 04:44:07 momjian Exp $
+ * $Id: mcxt.h,v 1.11 1998/09/01 04:39:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,8 +39,7 @@ extern MemoryContext TopMemoryContext;
  */
 extern void EnableMemoryContext(bool on);
 extern Pointer MemoryContextAlloc(MemoryContext context, Size size);
-extern Pointer
-MemoryContextRealloc(MemoryContext context,
+extern Pointer MemoryContextRealloc(MemoryContext context,
 					 Pointer pointer,
 					 Size size);
 extern void MemoryContextFree(MemoryContext context, Pointer pointer);
@@ -49,4 +48,4 @@ extern GlobalMemory CreateGlobalMemory(char *name);
 extern void GlobalMemoryDestroy(GlobalMemory context);
 
 
-#endif							/* MCXT_H */
+#endif	 /* MCXT_H */
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 71a2581676c..cfe7cdd626e 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.16 1998/04/27 14:46:17 scrappy Exp $
+ * $Id: memutils.h,v 1.17 1998/09/01 04:39:20 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -51,7 +51,7 @@ s...)
 #define DOUBLEALIGN(LEN)		_ALIGN(double, (LEN))
 #define MAXALIGN(LEN)			_ALIGN(double, (LEN))
 
-#endif							/* 0 */
+#endif	 /* 0 */
 
 /*
  *		SHORTALIGN(LEN) - length (or address) aligned for shorts
@@ -233,8 +233,7 @@ extern void AllocSetReset(AllocSet set);
 extern bool AllocSetContains(AllocSet set, AllocPointer pointer);
 extern AllocPointer AllocSetAlloc(AllocSet set, Size size);
 extern void AllocSetFree(AllocSet set, AllocPointer pointer);
-extern AllocPointer
-AllocSetRealloc(AllocSet set, AllocPointer pointer,
+extern AllocPointer AllocSetRealloc(AllocSet set, AllocPointer pointer,
 				Size size);
 
 extern void AllocSetDump(AllocSet set);
@@ -275,4 +274,4 @@ typedef uint32 AttributeSize;	/* XXX should be defined elsewhere */
 #define MaxIndexAttributeNumber 7
 
 
-#endif							/* MEMUTILS_H */
+#endif	 /* MEMUTILS_H */
diff --git a/src/include/utils/module.h b/src/include/utils/module.h
index 2b528fed8ff..39d42bc0732 100644
--- a/src/include/utils/module.h
+++ b/src/include/utils/module.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: module.h,v 1.3 1997/09/08 02:39:51 momjian Exp $
+ * $Id: module.h,v 1.4 1998/09/01 04:39:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,4 +22,4 @@
  */
 extern bool BypassEnable(int *enableCountInOutP, bool on);
 
-#endif							/* MODULE_H */
+#endif	 /* MODULE_H */
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 16a0221493c..7c6828e84cf 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nabstime.h,v 1.15 1998/02/13 17:12:08 scrappy Exp $
+ * $Id: nabstime.h,v 1.16 1998/09/01 04:39:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,7 +63,7 @@ typedef TimeIntervalData *TimeInterval;
 #define NOSTART_ABSTIME		 ((AbsoluteTime) INT_MIN)
 #else
 #define NOSTART_ABSTIME ((AbsoluteTime) 0x80000001)		/* -2147483647 == - 2^31 */
-#endif							/* _AIX */
+#endif	 /* _AIX */
 
 #define INVALID_RELTIME ((RelativeTime) 0x7FFFFFFE)		/* 2147483647 == 2^31 -
 														 * 1 */
@@ -120,4 +120,4 @@ extern bool AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2);
 
 extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn);
 
-#endif							/* NABSTIME_H */
+#endif	 /* NABSTIME_H */
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index b6f32c4f01b..2c969df174c 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: palloc.h,v 1.5 1997/09/08 02:39:53 momjian Exp $
+ * $Id: palloc.h,v 1.6 1998/09/01 04:39:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,4 +22,4 @@ extern void *repalloc(void *pointer, Size size);
 /* like strdup except uses palloc */
 extern char *pstrdup(char *pointer);
 
-#endif							/* PALLOC_H */
+#endif	 /* PALLOC_H */
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 2a99e2381d6..2c739721214 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.9 1998/02/26 04:44:09 momjian Exp $
+ * $Id: portal.h,v 1.10 1998/09/01 04:39:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -68,8 +68,7 @@ extern void AtEOXact_portals(void);
 extern void EnablePortalManager(bool on);
 extern Portal GetPortalByName(char *name);
 extern Portal BlankPortalAssignName(char *name);
-extern void
-PortalSetQuery(Portal portal, QueryDesc *queryDesc,
+extern void PortalSetQuery(Portal portal, QueryDesc *queryDesc,
 			   TupleDesc attinfo, EState *state,
 			   void (*cleanup) (Portal portal));
 extern QueryDesc *PortalGetQueryDesc(Portal portal);
@@ -87,4 +86,4 @@ extern PortalHeapMemory PortalGetHeapMemory(Portal portal);
 #define PORTALS_PER_USER	   10
 
 
-#endif							/* PORTAL_H */
+#endif	 /* PORTAL_H */
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index 4ede04c753b..11d64cdb4dc 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -24,7 +24,7 @@ char *ps_status_buffer = NULL;
 
 #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
 	{ \
-		int	i; \
+		int i; \
 		for (i = 0; i < (argc); i++) { \
 			memset((argv)[i], 0, strlen((argv)[i])); \
 		} \
@@ -49,7 +49,7 @@ char *ps_status_buffer = NULL;
 
 #else							/* !linux */
 
-extern const char **ps_status; 
+extern const char **ps_status;
 
 #define PS_DEFINE_BUFFER \
 const char **ps_status = NULL;
@@ -77,11 +77,11 @@ const char **ps_status = NULL;
 #endif
 
 #ifdef DONT_HAVE_PS_STATUS
-#define PS_DEFINE_BUFFER 
+#define PS_DEFINE_BUFFER
 #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname)
 #define PS_CLEAR_STATUS()
 #define PS_SET_STATUS(status) { if ((status)); }
 #define PS_STATUS ""
-#endif							/* !linux */
+#endif	 /* !linux */
 
-#endif							/* PS_STATUS_H */
+#endif	 /* PS_STATUS_H */
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
index 435da97782f..94477e0eac6 100644
--- a/src/include/utils/psort.h
+++ b/src/include/utils/psort.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: psort.h,v 1.15 1998/02/23 06:28:16 vadim Exp $
+ * $Id: psort.h,v 1.16 1998/09/01 04:39:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -106,4 +106,4 @@ extern void psort_restorepos(Sort *node);
 extern void psort_end(Sort *node);
 extern void psort_rescan(Sort *node);
 
-#endif							/* PSORT_H */
+#endif	 /* PSORT_H */
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 206c011ba2c..456b92305c8 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.19 1998/09/01 03:28:32 momjian Exp $
+ * $Id: rel.h,v 1.20 1998/09/01 04:39:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -177,8 +177,7 @@ typedef Relation *RelationPtr;
 
 extern IndexStrategy RelationGetIndexStrategy(Relation relation);
 
-extern void
-RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
+extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
 						RegProcedure *support);
 
-#endif							/* REL_H */
+#endif	 /* REL_H */
diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h
index 4440e508e44..ef6b7bc4376 100644
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel2.h,v 1.6 1998/02/26 04:44:10 momjian Exp $
+ * $Id: rel2.h,v 1.7 1998/09/01 04:39:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,8 +17,7 @@
 
 extern IndexStrategy RelationGetIndexStrategy(Relation relation);
 
-extern void
-RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
+extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
 						RegProcedure *support);
 
-#endif							/* TMP_REL2_H */
+#endif	 /* TMP_REL2_H */
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 19317bedfa9..ffe3ec75250 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relcache.h,v 1.9 1998/01/24 22:50:56 momjian Exp $
+ * $Id: relcache.h,v 1.10 1998/09/01 04:39:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,4 +34,4 @@ extern void RelationRegisterRelation(Relation relation);
 extern void RelationPurgeLocalRelation(bool xactComitted);
 extern void RelationInitialize(void);
 
-#endif							/* RELCACHE_H */
+#endif	 /* RELCACHE_H */
diff --git a/src/include/utils/sets.h b/src/include/utils/sets.h
index f928b4012b5..99ca816f43b 100644
--- a/src/include/utils/sets.h
+++ b/src/include/utils/sets.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sets.h,v 1.3 1997/09/08 02:39:58 momjian Exp $
+ * $Id: sets.h,v 1.4 1998/09/01 04:39:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,4 +19,4 @@
 extern Oid	SetDefine(char *querystr, char *typename);
 extern int	seteval(Oid funcoid);
 
-#endif							/* SETS_H */
+#endif	 /* SETS_H */
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index add859e5eae..3bb58383832 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.11 1998/08/19 02:04:09 momjian Exp $
+ * $Id: syscache.h,v 1.12 1998/09/01 04:39:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,7 +69,8 @@
  */
 struct cachedesc
 {
-	char	   *name;			/* this is Name so that we can initialize it */
+	char	   *name;			/* this is Name so that we can initialize
+								 * it */
 	int			nkeys;
 	int			key[4];
 	int			size;			/* sizeof(appropriate struct) */
@@ -80,19 +81,15 @@ struct cachedesc
 
 extern void zerocaches(void);
 extern void InitCatalogCache(void);
-extern HeapTuple
-SearchSysCacheTupleCopy(int cacheId,
+extern HeapTuple SearchSysCacheTupleCopy(int cacheId,
+						Datum key1, Datum key2, Datum key3, Datum key4);
+extern HeapTuple SearchSysCacheTuple(int cacheId,
 					Datum key1, Datum key2, Datum key3, Datum key4);
-extern HeapTuple
-SearchSysCacheTuple(int cacheId,
-					Datum key1, Datum key2, Datum key3, Datum key4);
-extern int32
-SearchSysCacheStruct(int cacheId, char *returnStruct,
+extern int32 SearchSysCacheStruct(int cacheId, char *returnStruct,
 					 Datum key1, Datum key2, Datum key3, Datum key4);
-extern void *
-SearchSysCacheGetAttribute(int cacheId,
+extern void *SearchSysCacheGetAttribute(int cacheId,
 						   AttrNumber attributeNumber,
-						   Datum key1, Datum key2, Datum key3, Datum key4);
+						 Datum key1, Datum key2, Datum key3, Datum key4);
 extern void *TypeDefaultRetrieve(Oid typId);
 
-#endif							/* SYSCACHE_H */
+#endif	 /* SYSCACHE_H */
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 8775eaf9aac..39bc9e86551 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tqual.h,v 1.13 1998/07/27 19:38:40 vadim Exp $
+ * $Id: tqual.h,v 1.14 1998/09/01 04:39:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,17 +18,17 @@
 
 typedef struct SnapshotData
 {
-	TransactionId		xmin;				/* XID < xmin are visible to me */
-	TransactionId		xmax;				/* XID > xmax are invisible to me */
-	TransactionId	   *xip;				/* array of xacts in progress */
-} SnapshotData;
+	TransactionId xmin;			/* XID < xmin are visible to me */
+	TransactionId xmax;			/* XID > xmax are invisible to me */
+	TransactionId *xip;			/* array of xacts in progress */
+}			SnapshotData;
 
-typedef SnapshotData	*Snapshot;
+typedef SnapshotData *Snapshot;
 
-#define	IsSnapshotNow(snapshot)		((Snapshot) snapshot == (Snapshot) 0x0)
-#define	IsSnapshotSelf(snapshot)	((Snapshot) snapshot == (Snapshot) 0x1)
-#define	SnapshotNow					((Snapshot) 0x0)
-#define	SnapshotSelf				((Snapshot) 0x1)
+#define IsSnapshotNow(snapshot)		((Snapshot) snapshot == (Snapshot) 0x0)
+#define IsSnapshotSelf(snapshot)	((Snapshot) snapshot == (Snapshot) 0x1)
+#define SnapshotNow					((Snapshot) 0x0)
+#define SnapshotSelf				((Snapshot) 0x1)
 
 extern TransactionId HeapSpecialTransactionId;
 extern CommandId HeapSpecialCommandId;
@@ -53,7 +53,7 @@ extern CommandId HeapSpecialCommandId;
 	) \
 )
 
-#define	heapisoverride() \
+#define heapisoverride() \
 ( \
 	(!TransactionIdIsValid(HeapSpecialTransactionId)) ? \
 		false \
@@ -77,4 +77,4 @@ extern bool HeapTupleSatisfiesNow(HeapTuple tuple);
 extern void setheapoverride(bool on);
 
 
-#endif							/* TQUAL_H */
+#endif	 /* TQUAL_H */
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index 7884e197fd2..4d71b20ea21 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -4,7 +4,7 @@
  *
  *	  Conditional trace definitions.
  *
- *    Massimo Dal Zotto <dz@cs.unitn.it>
+ *	  Massimo Dal Zotto <dz@cs.unitn.it>
  *
  *-------------------------------------------------------------------------
  */
@@ -20,16 +20,17 @@
 #include "postgres.h"
 
 #ifdef ELOG_TIMESTAMPS
-char *tprintf_timestamp(void);
+char	   *tprintf_timestamp(void);
+
 #define TIMESTAMP_SIZE 28
 #else
 #define TIMESTAMP_SIZE 0
 #endif
 
-extern int tprintf(int flag, const char *fmt, ...);
-extern int eprintf(const char *fmt, ...);
-extern int option_flag(int flag);
-extern int set_option_flag(int flag, int value);
+extern int	tprintf(int flag, const char *fmt,...);
+extern int	eprintf(const char *fmt,...);
+extern int	option_flag(int flag);
+extern int	set_option_flag(int flag, int value);
 extern void write_syslog(int level, char *line);
 extern void parse_options(char *str);
 extern void read_pg_options(SIGNAL_ARGS);
@@ -38,8 +39,10 @@ extern void read_pg_options(SIGNAL_ARGS);
  * Trace options, used as index into pg_options.
  * Must match the constants in pg_options[].
  */
-enum pg_option_enum {
-	TRACE_ALL,				/* 0=trace some, 1=trace all, -1=trace none */
+enum pg_option_enum
+{
+	TRACE_ALL,					/* 0=trace some, 1=trace all, -1=trace
+								 * none */
 	TRACE_VERBOSE,
 	TRACE_QUERY,
 	TRACE_PLAN,
@@ -48,7 +51,7 @@ enum pg_option_enum {
 	TRACE_PARSERSTATS,
 	TRACE_PLANNERSTATS,
 	TRACE_EXECUTORSTATS,
-	TRACE_SHORTLOCKS,		/* currently unused but needed, see lock.c */
+	TRACE_SHORTLOCKS,			/* currently unused but needed, see lock.c */
 	TRACE_LOCKS,
 	TRACE_USERLOCKS,
 	TRACE_SPINLOCKS,
@@ -57,29 +60,31 @@ enum pg_option_enum {
 	TRACE_PALLOC,
 	TRACE_LOCKOIDMIN,
 	TRACE_LOCKRELATION,
-	OPT_LOCKREADPRIORITY,	/* lock priority, see lock.c */
-	OPT_DEADLOCKTIMEOUT,	/* deadlock timeout, see proc.c */
-	OPT_SYSLOG,				/* use syslog for error messages */
-	OPT_HOSTLOOKUP,			/* enable hostname lookup in ps_status */
-	OPT_SHOWPORTNUMBER,		/* show port number in ps_status */
-	OPT_NOTIFYUNLOCK,		/* enable unlock of pg_listener after notify */
-	OPT_NOTIFYHACK,			/* enable notify hack to remove duplicate tuples */
+	OPT_LOCKREADPRIORITY,		/* lock priority, see lock.c */
+	OPT_DEADLOCKTIMEOUT,		/* deadlock timeout, see proc.c */
+	OPT_SYSLOG,					/* use syslog for error messages */
+	OPT_HOSTLOOKUP,				/* enable hostname lookup in ps_status */
+	OPT_SHOWPORTNUMBER,			/* show port number in ps_status */
+	OPT_NOTIFYUNLOCK,			/* enable unlock of pg_listener after
+								 * notify */
+	OPT_NOTIFYHACK,				/* enable notify hack to remove duplicate
+								 * tuples */
 
-	NUM_PG_OPTIONS			/* must be the last item of enum */
+	NUM_PG_OPTIONS				/* must be the last item of enum */
 };
 
-extern int pg_options[NUM_PG_OPTIONS];
+extern int	pg_options[NUM_PG_OPTIONS];
 
 #define PRINTF(args...)			tprintf(TRACE_ALL, args)
-#define EPRINTF(args...) 		eprintf(args)
+#define EPRINTF(args...)		eprintf(args)
 #define TPRINTF(flag, args...)	tprintf(flag, args)
 
-#endif							/* TRACE_H */
+#endif	 /* TRACE_H */
 
 /*
  * Local variables:
- *  tab-width: 4
- *  c-indent-level: 4
- *  c-basic-offset: 4
+ *	tab-width: 4
+ *	c-indent-level: 4
+ *	c-basic-offset: 4
  * End:
  */