New pgindent run with fixes suggested by Tom. Patch manually reviewed,

initdb/regression tests pass.

38 files changed, 94 insertions, 94 deletions

diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c
index 837b2ed7bdc..924062ed034 100644
--- a/contrib/btree_gist/btree_gist.c
+++ b/contrib/btree_gist/btree_gist.c
@@ -15,20 +15,20 @@ typedef struct intkey
 {
 	int4		lower;
 	int4		upper;
-}			INT4KEY;
+}	INT4KEY;
 
 typedef struct tskey
 {
 	Timestamp	lower;
 	Timestamp	upper;
-}			TSKEY;
+}	TSKEY;
 
 /* used for sorting */
 typedef struct rix
 {
 	int			index;
 	char	   *r;
-}			RIX;
+}	RIX;
 
 /*
 ** int4key in/out
diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c
index c7c3197c92b..7dfa95082a1 100644
--- a/contrib/chkpass/chkpass.c
+++ b/contrib/chkpass/chkpass.c
@@ -4,7 +4,7 @@
  * darcy@druid.net
  * http://www.druid.net/darcy/
  *
- * $Id: chkpass.c,v 1.5 2001/10/25 05:49:19 momjian Exp $
+ * $Id: chkpass.c,v 1.6 2001/11/05 17:46:22 momjian Exp $
  * best viewed with tabs set to 4
  */
 
@@ -32,7 +32,7 @@
 typedef struct chkpass
 {
 	char		password[16];
-}			chkpass;
+}	chkpass;
 
 /*
  * Various forward declarations:
diff --git a/contrib/cube/cubedata.h b/contrib/cube/cubedata.h
index 359fab28716..a1c5e8efcdf 100644
--- a/contrib/cube/cubedata.h
+++ b/contrib/cube/cubedata.h
@@ -3,4 +3,4 @@ typedef struct NDBOX
 	unsigned int size;			/* required to be a Postgres varlena type */
 	unsigned int dim;
 	float		x[1];
-}			NDBOX;
+}	NDBOX;
diff --git a/contrib/dbase/dbf.h b/contrib/dbase/dbf.h
index ab64d46690e..5d17c2ba145 100644
--- a/contrib/dbase/dbf.h
+++ b/contrib/dbase/dbf.h
@@ -51,7 +51,7 @@ typedef struct
 	u_char		dbh_hlen[2];	/* length of this header */
 	u_char		dbh_rlen[2];	/* length of a record */
 	u_char		dbh_stub[20];	/* misc stuff we don't need */
-}			dbf_header;
+}	dbf_header;
 
 /* disk field-description */
 
@@ -64,7 +64,7 @@ typedef struct
 	u_char		dbf_dec;		/* number of decimal positions if type is
 								 * 'N' */
 	u_char		dbf_stub[14];	/* stuff we don't need */
-}			dbf_field;
+}	dbf_field;
 
 /* memory field-description */
 
@@ -74,7 +74,7 @@ typedef struct
 	u_char		db_type;		/* field-type */
 	u_char		db_flen;		/* field-length */
 	u_char		db_dec;			/* number of decimal positions */
-}			f_descr;
+}	f_descr;
 
 /* memory dfb-header */
 
@@ -95,7 +95,7 @@ typedef struct
 	u_char	   *db_buff;		/* record-buffer to save malloc()'s */
 	f_descr    *db_fields;		/* pointer to an array of field-
 								 * descriptions */
-}			dbhead;
+}	dbhead;
 
 /* structure that contains everything a user wants from a field, including
    the contents (in ASCII). Warning! db_flen may be bigger than the actual
@@ -109,7 +109,7 @@ typedef struct
 	u_char		db_flen;		/* field-length */
 	u_char		db_dec;			/* number of decimal positions */
 	u_char	   *db_contents;	/* contents of the field in ASCII */
-}			field;
+}	field;
 
 /* prototypes for functions */
 
@@ -136,4 +136,4 @@ extern void put_long(u_char *cp, long lval);
 extern short get_short(u_char *cp);
 extern void put_short(u_char *cp, short lval);
 
-#endif	 /* _DBF_H */
+#endif   /* _DBF_H */
diff --git a/contrib/dblink/dblink.h b/contrib/dblink/dblink.h
index 4d2fd6e1ba3..8c5a5bdc287 100644
--- a/contrib/dblink/dblink.h
+++ b/contrib/dblink/dblink.h
@@ -54,7 +54,7 @@ typedef struct
 	 */
 	PGresult   *res;
 
-}			dblink_results;
+}	dblink_results;
 
 /*
  * External declarations
@@ -67,4 +67,4 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS);
  */
 dblink_results *init_dblink_results(MemoryContext fn_mcxt);
 
-#endif	 /* DBLINK_H */
+#endif   /* DBLINK_H */
diff --git a/contrib/fulltextindex/fti.c b/contrib/fulltextindex/fti.c
index a259e4b08bd..aabb2caf9f9 100644
--- a/contrib/fulltextindex/fti.c
+++ b/contrib/fulltextindex/fti.c
@@ -103,7 +103,7 @@ char	   *StopWords[] = {		/* list of words to skip in indexing */
 	"the",
 	"yes"
 };
-#endif	 /* USE_STOP_WORDS */
+#endif   /* USE_STOP_WORDS */
 
 /* stuff for caching query-plans, stolen from contrib/spi/\*.c */
 typedef struct
@@ -111,7 +111,7 @@ typedef struct
 	char	   *ident;
 	int			nplans;
 	void	  **splan;
-}			EPlan;
+}	EPlan;
 
 static EPlan *InsertPlans = NULL;
 static EPlan *DeletePlans = NULL;
@@ -403,7 +403,7 @@ is_stopword(char *text)
 		else
 			StopHigh = StopMiddle;
 	}
-#endif	 /* USE_STOP_WORDS */
+#endif   /* USE_STOP_WORDS */
 
 	return (false);
 }
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.h b/contrib/fuzzystrmatch/fuzzystrmatch.h
index 9c539818434..23e5e57d925 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.h
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.h
@@ -169,4 +169,4 @@ char		_codes[26] = {
 /* These prevent GH from becoming F */
 #define NOGHTOF(c)	(ENCODE(c) & 16)	/* BDH */
 
-#endif	 /* FUZZYSTRMATCH_H */
+#endif   /* FUZZYSTRMATCH_H */
diff --git a/contrib/isbn_issn/isbn_issn.c b/contrib/isbn_issn/isbn_issn.c
index bc21a0622ea..70115ceab24 100644
--- a/contrib/isbn_issn/isbn_issn.c
+++ b/contrib/isbn_issn/isbn_issn.c
@@ -1,7 +1,7 @@
 /*
  *	PostgreSQL type definitions for ISBNs.
  *
- *	$Id: isbn_issn.c,v 1.3 2001/02/10 02:31:25 tgl Exp $
+ *	$Id: isbn_issn.c,v 1.4 2001/11/05 17:46:23 momjian Exp $
  */
 
 #include "postgres.h"
@@ -16,7 +16,7 @@ typedef struct isbn
 {
 	char		num[13];
 	char		pad[3];
-}			isbn;
+}	isbn;
 
 /*
  *	Various forward declarations:
@@ -204,7 +204,7 @@ typedef struct issn
 {
 	char		num[9];
 	char		pad[7];
-}			issn;
+}	issn;
 
 /*
  *	Various forward declarations:
diff --git a/contrib/pg_dumplo/pg_dumplo.h b/contrib/pg_dumplo/pg_dumplo.h
index 5bb298fb007..cbced20ec89 100644
--- a/contrib/pg_dumplo/pg_dumplo.h
+++ b/contrib/pg_dumplo/pg_dumplo.h
@@ -1,7 +1,7 @@
 /* -------------------------------------------------------------------------
  * pg_dumplo
  *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.6 2001/10/28 06:25:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.7 2001/11/05 17:46:23 momjian Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------
@@ -41,7 +41,7 @@ typedef struct
 	char	   *lo_table,
 			   *lo_attr;
 	Oid			lo_oid;
-}			LOlist;
+}	LOlist;
 
 typedef struct
 {
@@ -60,7 +60,7 @@ typedef struct
 				quiet;
 	PGresult   *res;
 	PGconn	   *conn;
-}			LODumpMaster;
+}	LODumpMaster;
 
 typedef enum
 {
@@ -69,7 +69,7 @@ typedef enum
 	ACTION_EXPORT_ATTR,
 	ACTION_EXPORT_ALL,
 	ACTION_IMPORT
-}			PGLODUMP_ACTIONS;
+}	PGLODUMP_ACTIONS;
 
 extern char *progname;
 
@@ -79,4 +79,4 @@ extern void load_lolist(LODumpMaster * pgLO);
 extern void pglo_export(LODumpMaster * pgLO);
 extern void pglo_import(LODumpMaster * pgLO);
 
-#endif	 /* PG_DUMPLO_H */
+#endif   /* PG_DUMPLO_H */
diff --git a/contrib/pg_logger/pg_logger.c b/contrib/pg_logger/pg_logger.c
index cc2fdbed30d..cb28bf5e7a2 100644
--- a/contrib/pg_logger/pg_logger.c
+++ b/contrib/pg_logger/pg_logger.c
@@ -18,7 +18,7 @@ struct
 	const char *tag;
 	int			size;
 	int			priority;
-}			tags[] =
+}	tags[] =
 
 {
 	{
diff --git a/contrib/pg_resetxlog/pg_resetxlog.c b/contrib/pg_resetxlog/pg_resetxlog.c
index 653ba94371d..554bc839399 100644
--- a/contrib/pg_resetxlog/pg_resetxlog.c
+++ b/contrib/pg_resetxlog/pg_resetxlog.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.9 2001/10/28 06:25:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.10 2001/11/05 17:46:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -221,7 +221,7 @@ typedef struct crc64V0
 {
 	uint32		crc1;
 	uint32		crc2;
-}			crc64V0;
+}	crc64V0;
 
 static uint32 crc_tableV0[] = {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
@@ -309,7 +309,7 @@ typedef struct ControlFileDataV0
 	char		lc_collate[LOCALE_NAME_BUFLEN_V0];
 	char		lc_ctype[LOCALE_NAME_BUFLEN_V0];
 	char		archdir[MAXPGPATH];		/* where to move offline log files */
-}			ControlFileDataV0;
+}	ControlFileDataV0;
 
 typedef struct CheckPointV0
 {
@@ -323,7 +323,7 @@ typedef struct CheckPointV0
 	TransactionId nextXid;
 	Oid			nextOid;
 	bool		Shutdown;
-}			CheckPointV0;
+}	CheckPointV0;
 
 typedef struct XLogRecordV0
 {
@@ -334,14 +334,14 @@ typedef struct XLogRecordV0
 	uint16		xl_len;			/* total len of record *data* */
 	uint8		xl_info;
 	RmgrId		xl_rmid;		/* resource manager inserted this record */
-}			XLogRecordV0;
+}	XLogRecordV0;
 
 #define SizeOfXLogRecordV0	DOUBLEALIGN(sizeof(XLogRecordV0))
 
 typedef struct XLogContRecordV0
 {
 	uint16		xl_len;			/* len of data left */
-}			XLogContRecordV0;
+}	XLogContRecordV0;
 
 #define SizeOfXLogContRecordV0	DOUBLEALIGN(sizeof(XLogContRecordV0))
 
@@ -351,7 +351,7 @@ typedef struct XLogPageHeaderDataV0
 {
 	uint32		xlp_magic;
 	uint16		xlp_info;
-}			XLogPageHeaderDataV0;
+}	XLogPageHeaderDataV0;
 
 #define SizeOfXLogPHDV0   DOUBLEALIGN(sizeof(XLogPageHeaderDataV0))
 
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index c8aa0c14b72..8d20caf3e4c 100644
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.12 2001/10/25 05:49:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.13 2001/11/05 17:46:23 momjian Exp $
  *
  * pgbench: a simple TPC-B like benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -39,7 +39,7 @@
 
 /* for getrlimit */
 #include <sys/resource.h>
-#endif	 /* WIN32 */
+#endif   /* WIN32 */
 
 /********************************************************************
  * some configurable parameters */
@@ -90,7 +90,7 @@ typedef struct
 	int			tid;			/* teller id for this transaction */
 	int			delta;
 	int			abalance;
-}			CState;
+}	CState;
 
 static void
 usage()
@@ -680,7 +680,7 @@ main(int argc, char **argv)
 #else							/* but BSD doesn't ... */
 				if (getrlimit(RLIMIT_OFILE, &rlim) == -1)
 				{
-#endif	 /* HAVE_RLIMIT_NOFILE */
+#endif   /* HAVE_RLIMIT_NOFILE */
 					fprintf(stderr, "getrlimit failed. reason: %s\n", strerror(errno));
 					exit(1);
 				}
@@ -690,7 +690,7 @@ main(int argc, char **argv)
 					fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
 					exit(1);
 				}
-#endif	 /* #ifndef __CYGWIN__ */
+#endif   /* #ifndef __CYGWIN__ */
 				break;
 			case 'C':
 				is_connect = 1;
diff --git a/contrib/pgcrypto/blf.c b/contrib/pgcrypto/blf.c
index aae5b6033a4..e465bfe48a4 100644
--- a/contrib/pgcrypto/blf.c
+++ b/contrib/pgcrypto/blf.c
@@ -48,7 +48,7 @@
 #define inline __inline
 #else							/* !__GNUC__ */
 #define inline
-#endif	 /* !__GNUC__ */
+#endif   /* !__GNUC__ */
 
 /* Function for Feistel Networks */
 
diff --git a/contrib/pgcrypto/blf.h b/contrib/pgcrypto/blf.h
index 4677d055204..81159b13be4 100644
--- a/contrib/pgcrypto/blf.h
+++ b/contrib/pgcrypto/blf.h
@@ -50,7 +50,7 @@ typedef struct BlowfishContext
 {
 	uint32		S[4][256];		/* S-Boxes */
 	uint32		P[BLF_N + 2];	/* Subkeys */
-}			blf_ctx;
+}	blf_ctx;
 
 /* Raw access to customized Blowfish
  *	blf_key is just:
diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c
index 3bc8e19fa90..8ec2b188e04 100644
--- a/contrib/pgcrypto/crypt-blowfish.c
+++ b/contrib/pgcrypto/crypt-blowfish.c
@@ -61,7 +61,7 @@ typedef struct
 {
 	BF_word		S[4][0x100];
 	BF_key		P;
-}			BF_ctx;
+}	BF_ctx;
 
 /*
  * Magic IV for 64 Blowfish encryptions that we do at the end.
diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c
index ddfabe14b67..531a8a315fa 100644
--- a/contrib/pgcrypto/crypt-des.c
+++ b/contrib/pgcrypto/crypt-des.c
@@ -713,7 +713,7 @@ px_crypt_des(const char *key, const char *setting)
 		p = output + strlen(output);
 	}
 	else
-#endif	 /* !DISABLE_XDES */
+#endif   /* !DISABLE_XDES */
 	{
 		/*
 		 * "old"-style: setting - 2 bytes of salt key - up to 8 characters
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index ba1d17efd98..21dbe08614d 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: internal.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
+ * $Id: internal.c,v 1.8 2001/11/05 17:46:23 momjian Exp $
  */
 
 
@@ -61,7 +61,7 @@ static struct int_digest
 {
 	char	   *name;
 	void		(*init) (PX_MD * h);
-} int_digest_list[] =
+}	int_digest_list[] =
 
 {
 	{
@@ -520,7 +520,7 @@ static struct
 {
 	char	   *name;
 	PX_Cipher  *(*load) (void);
-} int_ciphers[] =
+}	int_ciphers[] =
 
 {
 	{
diff --git a/contrib/pgcrypto/md5.h b/contrib/pgcrypto/md5.h
index dfabe24a1e3..feadee2e808 100644
--- a/contrib/pgcrypto/md5.h
+++ b/contrib/pgcrypto/md5.h
@@ -1,4 +1,4 @@
-/*	$Id: md5.h,v 1.6 2001/10/28 06:25:41 momjian Exp $	*/
+/*	$Id: md5.h,v 1.7 2001/11/05 17:46:23 momjian Exp $	*/
 /*	   $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $	   */
 
 /*
@@ -59,7 +59,7 @@ typedef struct
 
 	unsigned int md5_i;
 	uint8		md5_buf[MD5_BUFLEN];
-}			md5_ctxt;
+}	md5_ctxt;
 
 extern void md5_init(md5_ctxt *);
 extern void md5_loop(md5_ctxt *, const uint8 *, unsigned int);
@@ -76,4 +76,4 @@ do {				\
 	md5_result((x), (y));	\
 } while (0)
 
-#endif	 /* ! _NETINET6_MD5_H_ */
+#endif   /* ! _NETINET6_MD5_H_ */
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 66b341949ac..c31954efd0a 100644
--- a/contrib/pgcrypto/openssl.c
+++ b/contrib/pgcrypto/openssl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: openssl.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
+ * $Id: openssl.c,v 1.8 2001/11/05 17:46:23 momjian Exp $
  */
 
 #include <postgres.h>
@@ -110,7 +110,7 @@ typedef struct
 	uint8		iv[EVP_MAX_IV_LENGTH];
 	uint		klen;
 	uint		init;
-}			ossldata;
+}	ossldata;
 
 /* generic EVP */
 
@@ -324,35 +324,35 @@ struct
 {
 	char	   *name;
 	PX_Cipher	cf;
-}			spec_types[] =
+}	spec_types[] =
 
 {
 	{
 		"bf-cbc",
 		{
 			gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-				bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
+			bf_init, bf_cbc_encrypt, bf_cbc_decrypt, gen_evp_free
 		}
 	},
 	{
 		"bf-ecb",
 		{
 			gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-				bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
+			bf_init, bf_ecb_encrypt, bf_ecb_decrypt, gen_evp_free
 		}
 	},
 	{
 		"bf-cfb",
 		{
 			gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-				bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
+			bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt, gen_evp_free
 		}
 	},
 	{
 		"bf-ofb",
 		{
 			gen_evp_block_size, gen_evp_key_size, gen_evp_iv_size,
-				bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
+			bf_init, bf_ofb64_encrypt, bf_ofb64_decrypt, gen_evp_free
 		}
 	},
 	{
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index fc0c4e94ac4..4bc1e8179f9 100644
--- a/contrib/pgcrypto/px-crypt.c
+++ b/contrib/pgcrypto/px-crypt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: px-crypt.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
+ * $Id: px-crypt.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
  */
 
 #include <postgres.h>
@@ -75,7 +75,7 @@ static struct
 	unsigned	id_len;
 	char	   *(*crypt) (const char *psw, const char *salt,
 									  char *buf, unsigned len);
-} px_crypt_list[] =
+}	px_crypt_list[] =
 
 {
 	{
diff --git a/contrib/pgcrypto/px-crypt.h b/contrib/pgcrypto/px-crypt.h
index 3d6f13ff1a5..2c1bcbf4b6b 100644
--- a/contrib/pgcrypto/px-crypt.h
+++ b/contrib/pgcrypto/px-crypt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: px-crypt.h,v 1.4 2001/10/28 06:25:41 momjian Exp $
+ * $Id: px-crypt.h,v 1.5 2001/11/05 17:46:23 momjian Exp $
  */
 
 #ifndef _PX_CRYPT_H
@@ -88,6 +88,6 @@ char	   *px_crypt_des(const char *key, const char *setting);
 /* crypt-md5.c */
 char *px_crypt_md5(const char *pw, const char *salt,
 			 char *dst, unsigned dstlen);
-#endif	 /* !PX_SYSTEM_CRYPT */
+#endif   /* !PX_SYSTEM_CRYPT */
 
-#endif	 /* _PX_CRYPT_H */
+#endif   /* _PX_CRYPT_H */
diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
index d2a87b26e19..b234600a288 100644
--- a/contrib/pgcrypto/px.h
+++ b/contrib/pgcrypto/px.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: px.h,v 1.3 2001/10/25 05:49:20 momjian Exp $
+ * $Id: px.h,v 1.4 2001/11/05 17:46:23 momjian Exp $
  */
 
 #ifndef __PX_H
@@ -180,4 +180,4 @@ const char *px_resolve_alias(const PX_Alias * aliases, const char *name);
 					(c)->decrypt(c, data, dlen, res, rlen)
 #define px_combo_free(c)		(c)->free(c)
 
-#endif	 /* __PX_H */
+#endif   /* __PX_H */
diff --git a/contrib/pgcrypto/random.c b/contrib/pgcrypto/random.c
index 4c3bb6db1b9..ce5f838a0c8 100644
--- a/contrib/pgcrypto/random.c
+++ b/contrib/pgcrypto/random.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: random.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
+ * $Id: random.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
  */
 
 
@@ -77,7 +77,7 @@ px_get_random_bytes(uint8 *dst, unsigned count)
 	close(fd);
 	return res;
 }
-#endif	 /* RAND_DEV */
+#endif   /* RAND_DEV */
 
 #ifdef RAND_SILLY
 
@@ -90,7 +90,7 @@ px_get_random_bytes(uint8 *dst, unsigned count)
 		*dst++ = random();
 	return i;
 }
-#endif	 /* RAND_SILLY */
+#endif   /* RAND_SILLY */
 
 #ifdef RAND_OPENSSL
 
@@ -125,4 +125,4 @@ px_get_random_bytes(uint8 *dst, unsigned count)
 	return -1;
 }
 
-#endif	 /* RAND_OPENSSL */
+#endif   /* RAND_OPENSSL */
diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c
index 546f39a20f4..55b09549c07 100644
--- a/contrib/pgcrypto/rijndael.c
+++ b/contrib/pgcrypto/rijndael.c
@@ -97,7 +97,7 @@ static u4byte il_tab[4][256];
 #endif
 
 static u4byte tab_gen = 0;
-#endif	 /* !PRE_CALC_TABLES */
+#endif   /* !PRE_CALC_TABLES */
 
 #define ff_mult(a,b)	(a && b ? pow_tab[(log_tab[a] + log_tab[b]) % 255] : 0)
 
@@ -251,7 +251,7 @@ gen_tabs(void)
 	}
 
 	tab_gen = 1;
-#endif	 /* !PRE_CALC_TABLES */
+#endif   /* !PRE_CALC_TABLES */
 }
 
 
diff --git a/contrib/pgcrypto/rijndael.h b/contrib/pgcrypto/rijndael.h
index 2f54e0c738f..59a4be7edd3 100644
--- a/contrib/pgcrypto/rijndael.h
+++ b/contrib/pgcrypto/rijndael.h
@@ -33,7 +33,7 @@ typedef struct _rijndael_ctx
 	int			decrypt;
 	u4byte		e_key[64];
 	u4byte		d_key[64];
-}			rijndael_ctx;
+}	rijndael_ctx;
 
 
 /* 2. Standard interface for AES cryptographic routines				*/
@@ -54,4 +54,4 @@ void		aes_ecb_decrypt(rijndael_ctx * ctx, uint8 *data, unsigned len);
 void		aes_cbc_encrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len);
 void		aes_cbc_decrypt(rijndael_ctx * ctx, uint8 *iva, uint8 *data, unsigned len);
 
-#endif	 /* _RIJNDAEL_H_ */
+#endif   /* _RIJNDAEL_H_ */
diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c
index 129ce7a55c0..01bd072089f 100644
--- a/contrib/pgcrypto/sha1.c
+++ b/contrib/pgcrypto/sha1.c
@@ -1,4 +1,4 @@
-/*	$Id: sha1.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ */
+/*	$Id: sha1.c,v 1.10 2001/11/05 17:46:23 momjian Exp $ */
 /*	   $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $    */
 
 /*
@@ -346,4 +346,4 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0)
 #endif
 }
 
-#endif	 /* unsupported */
+#endif   /* unsupported */
diff --git a/contrib/pgcrypto/sha1.h b/contrib/pgcrypto/sha1.h
index 1699b385a42..096a9a40adf 100644
--- a/contrib/pgcrypto/sha1.h
+++ b/contrib/pgcrypto/sha1.h
@@ -1,4 +1,4 @@
-/*	$Id: sha1.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */
+/*	$Id: sha1.h,v 1.8 2001/11/05 17:46:23 momjian Exp $ */
 /*	   $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $    */
 
 /*
@@ -72,4 +72,4 @@ typedef struct sha1_ctxt SHA1_CTX;
 
 #define SHA1_RESULTLEN	(160/8)
 
-#endif	 /* _NETINET6_SHA1_H_ */
+#endif   /* _NETINET6_SHA1_H_ */
diff --git a/contrib/seg/segdata.h b/contrib/seg/segdata.h
index 773883bbb72..69d85e0bc0c 100644
--- a/contrib/seg/segdata.h
+++ b/contrib/seg/segdata.h
@@ -6,4 +6,4 @@ typedef struct SEG
 	char		u_sigd;
 	char		l_ext;
 	char		u_ext;
-}			SEG;
+}	SEG;
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index f1163739e6b..b4e6845ac67 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -17,7 +17,7 @@ typedef struct
 	char	   *ident;
 	int			nplans;
 	void	  **splan;
-}			EPlan;
+}	EPlan;
 
 static EPlan *FPlans = NULL;
 static int	nFPlans = 0;
diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c
index bc8a1112f4b..1731190a5db 100644
--- a/contrib/spi/timetravel.c
+++ b/contrib/spi/timetravel.c
@@ -17,7 +17,7 @@ typedef struct
 {
 	char	   *ident;
 	void	   *splan;
-}			EPlan;
+}	EPlan;
 
 static EPlan *Plans = NULL;		/* for UPDATE/DELETE */
 static int	nPlans = 0;
diff --git a/contrib/tsearch/gistidx.h b/contrib/tsearch/gistidx.h
index cb4d2f5a70c..db1b501e922 100644
--- a/contrib/tsearch/gistidx.h
+++ b/contrib/tsearch/gistidx.h
@@ -46,7 +46,7 @@ typedef struct
 	int4		len;
 	int4		flag;
 	char		data[1];
-}			GISTTYPE;
+}	GISTTYPE;
 
 #define ARRKEY		0x01
 #define SIGNKEY		0x02
diff --git a/contrib/tsearch/morph.c b/contrib/tsearch/morph.c
index 3a66ecbbc68..9eaefabfafc 100644
--- a/contrib/tsearch/morph.c
+++ b/contrib/tsearch/morph.c
@@ -34,7 +34,7 @@ typedef struct
 	char	   *(*lemmatize) (void *, char *, int *);
 	int			(*is_stoplemm) (void *, char *, int);
 	int			(*is_stemstoplemm) (void *, char *, int);
-}			DICT;
+}	DICT;
 
 /* insert all dictionaries */
 #define DICT_BODY
diff --git a/contrib/tsearch/query.c b/contrib/tsearch/query.c
index 4bda2617afe..46703d70a38 100644
--- a/contrib/tsearch/query.c
+++ b/contrib/tsearch/query.c
@@ -72,7 +72,7 @@ typedef struct NODE
 	int2		distance;
 	int2		length;
 	struct NODE *next;
-}			NODE;
+}	NODE;
 
 typedef struct
 {
@@ -92,7 +92,7 @@ typedef struct
 
 	/* state for value's parser */
 	TI_IN_STATE valstate;
-}			QPRS_STATE;
+}	QPRS_STATE;
 
 /*
  * get token from query string
@@ -322,7 +322,7 @@ typedef struct
 	WordEntry  *arre;
 	char	   *values;
 	char	   *operand;
-}			CHKVAL;
+}	CHKVAL;
 
 /*
  * compare 2 string values
@@ -626,7 +626,7 @@ typedef struct
 	char	   *cur;
 	char	   *op;
 	int4		buflen;
-}			INFIX;
+}	INFIX;
 
 #define RESIZEBUF(inf,addsize) \
 while( ( inf->cur - inf->buf ) + addsize + 1 >= inf->buflen ) \
diff --git a/contrib/tsearch/query.h b/contrib/tsearch/query.h
index 4b3664b2ae5..6d55f6b411e 100644
--- a/contrib/tsearch/query.h
+++ b/contrib/tsearch/query.h
@@ -17,7 +17,7 @@ typedef struct ITEM
 	/* user-friendly value */
 	uint16		distance;
 	uint16		length;
-}			ITEM;
+}	ITEM;
 
 /*
  *Storage:
@@ -28,7 +28,7 @@ typedef struct
 	int4		len;
 	int4		size;
 	char		data[1];
-}			QUERYTYPE;
+}	QUERYTYPE;
 
 #define HDRSIZEQT	( 2*sizeof(int4) )
 #define COMPUTESIZE(size,lenofoperand)	( HDRSIZEQT + size * sizeof(ITEM) + lenofoperand )
diff --git a/contrib/tsearch/rewrite.c b/contrib/tsearch/rewrite.c
index 9ad7a0a86af..5036c420ff2 100644
--- a/contrib/tsearch/rewrite.c
+++ b/contrib/tsearch/rewrite.c
@@ -24,7 +24,7 @@ typedef struct NODE
 	struct NODE *left;
 	struct NODE *right;
 	ITEM	   *valnode;
-}			NODE;
+}	NODE;
 
 /*
  * make query tree from plain view of query
@@ -50,7 +50,7 @@ typedef struct
 	ITEM	   *ptr;
 	int4		len;
 	int4		cur;
-}			PLAINTREE;
+}	PLAINTREE;
 
 static void
 plainnode(PLAINTREE * state, NODE * node)
diff --git a/contrib/tsearch/txtidx.c b/contrib/tsearch/txtidx.c
index 735e90c96a1..5eeb69b1512 100644
--- a/contrib/tsearch/txtidx.c
+++ b/contrib/tsearch/txtidx.c
@@ -334,7 +334,7 @@ typedef struct
 	WORD	   *words;
 	int4		lenwords;
 	int4		curwords;
-}			PRSTEXT;
+}	PRSTEXT;
 
 /*
  * Parse text to lexems
diff --git a/contrib/tsearch/txtidx.h b/contrib/tsearch/txtidx.h
index 3344186bdda..f528cbd5e7c 100644
--- a/contrib/tsearch/txtidx.h
+++ b/contrib/tsearch/txtidx.h
@@ -18,14 +18,14 @@ typedef struct
 {
 	uint16		len;
 	uint16		pos;
-}			WordEntry;
+}	WordEntry;
 
 typedef struct
 {
 	int4		len;
 	int4		size;
 	char		data[1];
-}			txtidx;
+}	txtidx;
 
 #define DATAHDRSIZE (sizeof(int4)*2)
 #define CALCDATASIZE(x, lenstr) ( x * sizeof(WordEntry) + DATAHDRSIZE + lenstr )
@@ -41,7 +41,7 @@ typedef struct
 	int4		len;
 	int4		state;
 	bool		oprisdelim;
-}			TI_IN_STATE;
+}	TI_IN_STATE;
 
 int4		gettoken_txtidx(TI_IN_STATE * state);
 
diff --git a/contrib/xml/pgxml.h b/contrib/xml/pgxml.h
index 605031861de..2b80124b771 100644
--- a/contrib/xml/pgxml.h
+++ b/contrib/xml/pgxml.h
@@ -24,7 +24,7 @@ typedef struct
 	char	   *results[MAXRESULTS];
 	int32		reslens[MAXRESULTS];
 	char	   *resbuf;			/* pointer to the result buffer for pfree */
-}			XPath_Results;
+}	XPath_Results;
 
 
 
@@ -36,7 +36,7 @@ typedef struct
 	char	   *resptr;
 	int32		reslen;
 	XPath_Results *xpres;
-}			pgxml_udata;
+}	pgxml_udata;
 
 
 #define UD ((pgxml_udata *) userData)