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

spacing.  Also adds space for one-line comments.

31 files changed, 66 insertions, 46 deletions

diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c
index 4235c0a5d9b..837b2ed7bdc 100644
--- a/contrib/btree_gist/btree_gist.c
+++ b/contrib/btree_gist/btree_gist.c
@@ -486,7 +486,7 @@ tskey_cmp(const void *a, const void *b)
 				  TimestampGetDatum(((TSKEY *) (((RIX *) a)->r))->lower),
 				   TimestampGetDatum(((TSKEY *) (((RIX *) b)->r))->lower)
 											 )
-	);
+		);
 }
 
 /**************************************************
diff --git a/contrib/dbase/dbf.h b/contrib/dbase/dbf.h
index b54093bacee..ab64d46690e 100644
--- a/contrib/dbase/dbf.h
+++ b/contrib/dbase/dbf.h
@@ -59,7 +59,7 @@ typedef struct
 {
 	u_char		dbf_name[DBF_NAMELEN];	/* field-name terminated with \0 */
 	u_char		dbf_type;		/* field-type */
-	u_char		dbf_reserved[4];		/* some reserved stuff */
+	u_char		dbf_reserved[4];	/* some reserved stuff */
 	u_char		dbf_flen;		/* field-length */
 	u_char		dbf_dec;		/* number of decimal positions if type is
 								 * 'N' */
@@ -135,4 +135,5 @@ extern long get_long(u_char *cp);
 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 */
diff --git a/contrib/dblink/dblink.h b/contrib/dblink/dblink.h
index f4de437e3df..4d2fd6e1ba3 100644
--- a/contrib/dblink/dblink.h
+++ b/contrib/dblink/dblink.h
@@ -66,4 +66,5 @@ extern Datum dblink_tok(PG_FUNCTION_ARGS);
  * Internal declarations
  */
 dblink_results *init_dblink_results(MemoryContext fn_mcxt);
+
 #endif	 /* DBLINK_H */
diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
index 431756e9a77..b2c3af699a5 100644
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -1,7 +1,7 @@
 /*
  *	PostgreSQL type definitions for managed LargeObjects.
  *
- *	$Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.9 2001/10/25 05:49:19 momjian Exp $
+ *	$Header: /cvsroot/pgsql/contrib/lo/lo.c,v 1.10 2001/10/28 06:25:40 momjian Exp $
  *
  */
 
@@ -33,8 +33,8 @@ typedef Oid Blob;
  */
 
 Blob	   *lo_in(char *str);	/* Create from String		*/
-char	   *lo_out(Blob * addr);		/* Output oid as String		*/
-Oid			lo_oid(Blob * addr);		/* Return oid as an oid		*/
+char	   *lo_out(Blob * addr);	/* Output oid as String		*/
+Oid			lo_oid(Blob * addr);	/* Return oid as an oid		*/
 Blob	   *lo(Oid oid);		/* Return Blob based on oid */
 Datum		lo_manage(PG_FUNCTION_ARGS);		/* Trigger handler		   */
 
@@ -139,7 +139,7 @@ lo_manage(PG_FUNCTION_ARGS)
 	TupleDesc	tupdesc;		/* Tuple Descriptor				*/
 	HeapTuple	rettuple;		/* Tuple to be returned			*/
 	bool		isdelete;		/* are we deleting?				*/
-	HeapTuple	newtuple = NULL;		/* The new value for tuple		*/
+	HeapTuple	newtuple = NULL;	/* The new value for tuple		*/
 	HeapTuple	trigtuple;		/* The original value of tuple	*/
 
 	if (!CALLED_AS_TRIGGER(fcinfo))
diff --git a/contrib/miscutil/misc_utils.h b/contrib/miscutil/misc_utils.h
index 0fb07012dfa..f4577f49de4 100644
--- a/contrib/miscutil/misc_utils.h
+++ b/contrib/miscutil/misc_utils.h
@@ -6,4 +6,5 @@ int			unlisten(char *relname);
 int			max(int x, int y);
 int			min(int x, int y);
 int			active_listeners(text *relname);
+
 #endif
diff --git a/contrib/pg_dumplo/pg_dumplo.h b/contrib/pg_dumplo/pg_dumplo.h
index 1c76cfb624c..5bb298fb007 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.5 2001/10/25 05:49:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/pg_dumplo.h,v 1.6 2001/10/28 06:25:40 momjian Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------
@@ -64,11 +64,11 @@ typedef struct
 
 typedef enum
 {
-				ACTION_NONE,
-				ACTION_SHOW,
-				ACTION_EXPORT_ATTR,
-				ACTION_EXPORT_ALL,
-				ACTION_IMPORT
+	ACTION_NONE,
+	ACTION_SHOW,
+	ACTION_EXPORT_ATTR,
+	ACTION_EXPORT_ALL,
+	ACTION_IMPORT
 }			PGLODUMP_ACTIONS;
 
 extern char *progname;
@@ -78,4 +78,5 @@ extern void index_file(LODumpMaster * pgLO);
 extern void load_lolist(LODumpMaster * pgLO);
 extern void pglo_export(LODumpMaster * pgLO);
 extern void pglo_import(LODumpMaster * pgLO);
+
 #endif	 /* PG_DUMPLO_H */
diff --git a/contrib/pg_resetxlog/pg_resetxlog.c b/contrib/pg_resetxlog/pg_resetxlog.c
index b6981345e2f..653ba94371d 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.8 2001/10/25 05:49:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.9 2001/10/28 06:25:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -491,7 +491,7 @@ ReadRecordV0(XLogRecPtr *RecPtr, char *buffer)
 		readFile = XLogFileOpen(readId, readSeg);
 		if (readFile < 0)
 			goto next_record_is_invalid;
-		readOff = (uint32) (-1);		/* force read to occur below */
+		readOff = (uint32) (-1);	/* force read to occur below */
 	}
 
 	targetPageOff = ((RecPtr->xrecoff % XLogSegSize) / BLCKSZ) * BLCKSZ;
diff --git a/contrib/pgcrypto/blf.h b/contrib/pgcrypto/blf.h
index 37d40218035..4677d055204 100644
--- a/contrib/pgcrypto/blf.h
+++ b/contrib/pgcrypto/blf.h
@@ -79,4 +79,5 @@ void		blf_ecb_decrypt(blf_ctx *, uint8 *, uint32);
 
 void		blf_cbc_encrypt(blf_ctx *, uint8 *, uint8 *, uint32);
 void		blf_cbc_decrypt(blf_ctx *, uint8 *, uint8 *, uint32);
+
 #endif
diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c
index eacb192ad08..bc403b2ec30 100644
--- a/contrib/pgcrypto/crypt-des.c
+++ b/contrib/pgcrypto/crypt-des.c
@@ -159,14 +159,14 @@ static uint8 pbox[32] = {
 
 static uint32 _crypt_bits32[32] =
 {
-				0x80000000, 0x40000000, 0x20000000, 0x10000000,
-				0x08000000, 0x04000000, 0x02000000, 0x01000000,
-				0x00800000, 0x00400000, 0x00200000, 0x00100000,
-				0x00080000, 0x00040000, 0x00020000, 0x00010000,
-				0x00008000, 0x00004000, 0x00002000, 0x00001000,
-				0x00000800, 0x00000400, 0x00000200, 0x00000100,
-				0x00000080, 0x00000040, 0x00000020, 0x00000010,
-				0x00000008, 0x00000004, 0x00000002, 0x00000001
+	0x80000000, 0x40000000, 0x20000000, 0x10000000,
+		0x08000000, 0x04000000, 0x02000000, 0x01000000,
+		0x00800000, 0x00400000, 0x00200000, 0x00100000,
+		0x00080000, 0x00040000, 0x00020000, 0x00010000,
+		0x00008000, 0x00004000, 0x00002000, 0x00001000,
+		0x00000800, 0x00000400, 0x00000200, 0x00000100,
+		0x00000080, 0x00000040, 0x00000020, 0x00000010,
+		0x00000008, 0x00000004, 0x00000002, 0x00000001
 };
 
 static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index 00ff81e5b7a..ba1d17efd98 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.6 2001/10/25 05:49:19 momjian Exp $
+ * $Id: internal.c,v 1.7 2001/10/28 06:25:41 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 868f8a233a0..dfabe24a1e3 100644
--- a/contrib/pgcrypto/md5.h
+++ b/contrib/pgcrypto/md5.h
@@ -1,4 +1,4 @@
-/*	$Id: md5.h,v 1.5 2001/08/21 00:42:41 momjian Exp $	*/
+/*	$Id: md5.h,v 1.6 2001/10/28 06:25:41 momjian Exp $	*/
 /*	   $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $	   */
 
 /*
@@ -75,4 +75,5 @@ do {				\
 	md5_pad((y));		\
 	md5_result((x), (y));	\
 } while (0)
+
 #endif	 /* ! _NETINET6_MD5_H_ */
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index f9769b7e208..66b341949ac 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.6 2001/10/25 05:49:19 momjian Exp $
+ * $Id: openssl.c,v 1.7 2001/10/28 06:25:41 momjian Exp $
  */
 
 #include <postgres.h>
@@ -331,28 +331,28 @@ struct
 		"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/pgcrypto.h b/contrib/pgcrypto/pgcrypto.h
index 26d04c5dc41..0d8c1174f2d 100644
--- a/contrib/pgcrypto/pgcrypto.h
+++ b/contrib/pgcrypto/pgcrypto.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pgcrypto.h,v 1.6 2001/10/25 05:49:20 momjian Exp $
+ * $Id: pgcrypto.h,v 1.7 2001/10/28 06:25:41 momjian Exp $
  */
 
 #ifndef _PG_CRYPTO_H
@@ -45,4 +45,5 @@ Datum		pg_decrypt(PG_FUNCTION_ARGS);
 Datum		pg_encrypt_iv(PG_FUNCTION_ARGS);
 Datum		pg_decrypt_iv(PG_FUNCTION_ARGS);
 Datum		pg_cipher_exists(PG_FUNCTION_ARGS);
+
 #endif
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index c0821408087..fc0c4e94ac4 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.3 2001/10/25 05:49:20 momjian Exp $
+ * $Id: px-crypt.c,v 1.4 2001/10/28 06:25:41 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 7265d414915..3d6f13ff1a5 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.3 2001/10/25 05:49:20 momjian Exp $
+ * $Id: px-crypt.h,v 1.4 2001/10/28 06:25:41 momjian Exp $
  */
 
 #ifndef _PX_CRYPT_H
@@ -89,4 +89,5 @@ char	   *px_crypt_des(const char *key, const char *setting);
 char *px_crypt_md5(const char *pw, const char *salt,
 			 char *dst, unsigned dstlen);
 #endif	 /* !PX_SYSTEM_CRYPT */
+
 #endif	 /* _PX_CRYPT_H */
diff --git a/contrib/pgcrypto/random.c b/contrib/pgcrypto/random.c
index 559e40c4561..4c3bb6db1b9 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.3 2001/10/25 05:49:20 momjian Exp $
+ * $Id: random.c,v 1.4 2001/10/28 06:25:41 momjian Exp $
  */
 
 
@@ -124,4 +124,5 @@ px_get_random_bytes(uint8 *dst, unsigned count)
 
 	return -1;
 }
+
 #endif	 /* RAND_OPENSSL */
diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c
index cca8759e8b6..546f39a20f4 100644
--- a/contrib/pgcrypto/rijndael.c
+++ b/contrib/pgcrypto/rijndael.c
@@ -664,4 +664,5 @@ main()
 	printf("\n};\n\n");
 	return 0;
 }
+
 #endif
diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c
index 26095697907..129ce7a55c0 100644
--- a/contrib/pgcrypto/sha1.c
+++ b/contrib/pgcrypto/sha1.c
@@ -1,4 +1,4 @@
-/*	$Id: sha1.c,v 1.8 2001/10/25 05:49:20 momjian Exp $ */
+/*	$Id: sha1.c,v 1.9 2001/10/28 06:25:41 momjian Exp $ */
 /*	   $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $    */
 
 /*
@@ -345,4 +345,5 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0)
 	digest[19] = ctxt->h.b8[16];
 #endif
 }
+
 #endif	 /* unsupported */
diff --git a/contrib/pgcrypto/sha1.h b/contrib/pgcrypto/sha1.h
index 03c6443ccc4..1699b385a42 100644
--- a/contrib/pgcrypto/sha1.h
+++ b/contrib/pgcrypto/sha1.h
@@ -1,4 +1,4 @@
-/*	$Id: sha1.h,v 1.6 2001/10/25 05:49:20 momjian Exp $ */
+/*	$Id: sha1.h,v 1.7 2001/10/28 06:25:41 momjian Exp $ */
 /*	   $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $    */
 
 /*
@@ -71,4 +71,5 @@ typedef struct sha1_ctxt SHA1_CTX;
 #define SHA1Final(x, y)		sha1_result((y), (x))
 
 #define SHA1_RESULTLEN	(160/8)
+
 #endif	 /* _NETINET6_SHA1_H_ */
diff --git a/contrib/rserv/rserv.c b/contrib/rserv/rserv.c
index be4a136a1b9..6faab692d7a 100644
--- a/contrib/rserv/rserv.c
+++ b/contrib/rserv/rserv.c
@@ -43,7 +43,7 @@ _rserv_log_()
 	char	  **args;			/* argument: argnum */
 	Relation	rel;			/* triggered relation */
 	HeapTuple	tuple;			/* tuple to return */
-	HeapTuple	newtuple = NULL;		/* tuple to return */
+	HeapTuple	newtuple = NULL;	/* tuple to return */
 	TupleDesc	tupdesc;		/* tuple description */
 	int			keynum;
 	char	   *key;
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index 441c1e884d9..f1163739e6b 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -52,7 +52,7 @@ check_primary_key(PG_FUNCTION_ARGS)
 	HeapTuple	tuple = NULL;	/* tuple to return */
 	TupleDesc	tupdesc;		/* tuple description */
 	EPlan	   *plan;			/* prepared plan */
-	Oid		   *argtypes = NULL;		/* key types to prepare execution plan */
+	Oid		   *argtypes = NULL;	/* key types to prepare execution plan */
 	bool		isnull;			/* to know is some column NULL or not */
 	char		ident[2 * NAMEDATALEN]; /* to identify myself */
 	int			ret;
@@ -235,10 +235,10 @@ check_foreign_key(PG_FUNCTION_ARGS)
 	char	   *relname;		/* referencing relation name */
 	Relation	rel;			/* triggered relation */
 	HeapTuple	trigtuple = NULL;		/* tuple to being changed */
-	HeapTuple	newtuple = NULL;		/* tuple to return */
+	HeapTuple	newtuple = NULL;	/* tuple to return */
 	TupleDesc	tupdesc;		/* tuple description */
 	EPlan	   *plan;			/* prepared plan(s) */
-	Oid		   *argtypes = NULL;		/* key types to prepare execution plan */
+	Oid		   *argtypes = NULL;	/* key types to prepare execution plan */
 	bool		isnull;			/* to know is some column NULL or not */
 	bool		isequal = true; /* are keys in both tuples equal (in
 								 * UPDATE) */
diff --git a/contrib/tsearch/crc32.h b/contrib/tsearch/crc32.h
index b08065d8c87..97254a4a909 100644
--- a/contrib/tsearch/crc32.h
+++ b/contrib/tsearch/crc32.h
@@ -6,4 +6,5 @@ extern unsigned int crc32_sz(char *buf, int size);
 
 /* Returns crc32 of null-terminated string */
 #define crc32(buf) crc32_sz((buf),strlen(buf))
+
 #endif
diff --git a/contrib/tsearch/deflex.h b/contrib/tsearch/deflex.h
index 7fbd84adf11..f9d68471679 100644
--- a/contrib/tsearch/deflex.h
+++ b/contrib/tsearch/deflex.h
@@ -25,4 +25,5 @@
 #define FILEPATH	19
 
 extern const char *descr[];
+
 #endif
diff --git a/contrib/tsearch/gistidx.h b/contrib/tsearch/gistidx.h
index f4576a1d240..cb4d2f5a70c 100644
--- a/contrib/tsearch/gistidx.h
+++ b/contrib/tsearch/gistidx.h
@@ -62,4 +62,5 @@ typedef struct
 #define GETSIGN(x)	( (BITVECP)( (char*)x+GTHDRSIZE ) )
 #define GETARR(x)	( (int4*)( (char*)x+GTHDRSIZE ) )
 #define ARRNELEM(x) ( ( ((GISTTYPE*)x)->len - GTHDRSIZE )/sizeof(int4) )
+
 #endif
diff --git a/contrib/tsearch/morph.h b/contrib/tsearch/morph.h
index 1c64227fae0..24bb0efc8c5 100644
--- a/contrib/tsearch/morph.h
+++ b/contrib/tsearch/morph.h
@@ -6,4 +6,5 @@ void		initmorph(void);
 char	   *lemmatize(char *word, int *len, int type);
 
 bool		is_stoptype(int type);
+
 #endif
diff --git a/contrib/tsearch/parser.h b/contrib/tsearch/parser.h
index 0e43e675fb2..f3aa0b8c06b 100644
--- a/contrib/tsearch/parser.h
+++ b/contrib/tsearch/parser.h
@@ -7,4 +7,5 @@ int			tsearch_yylex(void);
 void		start_parse_str(char *, int);
 void		start_parse_fh(FILE *, int);
 void		end_parse(void);
+
 #endif
diff --git a/contrib/tsearch/query.c b/contrib/tsearch/query.c
index 90687d38cf0..4bda2617afe 100644
--- a/contrib/tsearch/query.c
+++ b/contrib/tsearch/query.c
@@ -104,7 +104,7 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval)
 	{
 		switch (state->state)
 		{
-				case WAITOPERAND:
+			case WAITOPERAND:
 				if (*(state->buf) == '!')
 				{
 					(state->buf)++;
@@ -408,7 +408,7 @@ rexecqtxt(PG_FUNCTION_ARGS)
 							   execqtxt,
 							   PG_GETARG_DATUM(1),
 							   PG_GETARG_DATUM(0)
-	);
+		);
 }
 
 Datum
diff --git a/contrib/tsearch/query.h b/contrib/tsearch/query.h
index a5f8d7deb8a..4b3664b2ae5 100644
--- a/contrib/tsearch/query.h
+++ b/contrib/tsearch/query.h
@@ -48,4 +48,5 @@ typedef struct
 
 bool execute(ITEM * curitem, void *checkval,
 		bool calcnot, bool (*chkcond) (void *checkval, ITEM * val));
+
 #endif
diff --git a/contrib/tsearch/rewrite.h b/contrib/tsearch/rewrite.h
index c53e1c6daca..6b3543faca7 100644
--- a/contrib/tsearch/rewrite.h
+++ b/contrib/tsearch/rewrite.h
@@ -3,4 +3,5 @@
 
 ITEM	   *clean_NOT(ITEM * ptr, int4 *len);
 ITEM	   *clean_fakeval(ITEM * ptr, int4 *len);
+
 #endif
diff --git a/contrib/tsearch/txtidx.c b/contrib/tsearch/txtidx.c
index 6e1fe0edaeb..735e90c96a1 100644
--- a/contrib/tsearch/txtidx.c
+++ b/contrib/tsearch/txtidx.c
@@ -327,7 +327,7 @@ typedef struct
 {
 	uint16		len;
 	char	   *word;
-}			WORD;
+} WORD;
 
 typedef struct
 {
@@ -402,7 +402,7 @@ compareWORD(const void *a, const void *b)
 }
 
 static int
-uniqueWORD(WORD * a, int4 l)
+uniqueWORD(WORD *a, int4 l)
 {
 	WORD	   *ptr,
 			   *res;
diff --git a/contrib/tsearch/txtidx.h b/contrib/tsearch/txtidx.h
index d33bdf9d6d3..3344186bdda 100644
--- a/contrib/tsearch/txtidx.h
+++ b/contrib/tsearch/txtidx.h
@@ -44,4 +44,5 @@ typedef struct
 }			TI_IN_STATE;
 
 int4		gettoken_txtidx(TI_IN_STATE * state);
+
 #endif