Run pgindent on 9.2 source tree in preparation for first 9.3

commit-fest.

494 files changed, 7504 insertions, 7207 deletions

diff --git a/contrib/auto_explain/auto_explain.c b/contrib/auto_explain/auto_explain.c
index e48ea489dc..ad333b6644 100644
--- a/contrib/auto_explain/auto_explain.c
+++ b/contrib/auto_explain/auto_explain.c
@@ -23,7 +23,7 @@ static int	auto_explain_log_min_duration = -1; /* msec or -1 */
 static bool auto_explain_log_analyze = false;
 static bool auto_explain_log_verbose = false;
 static bool auto_explain_log_buffers = false;
-static bool auto_explain_log_timing  = false;
+static bool auto_explain_log_timing = false;
 static int	auto_explain_log_format = EXPLAIN_FORMAT_TEXT;
 static bool auto_explain_log_nested_statements = false;
 
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 71acb35af6..1e62d8091a 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -1140,7 +1140,7 @@ storeHandler(PGresult *res, const PGdataValue *columns,
 	 * strings and add null termination.  As a micro-optimization, allocate
 	 * all the strings with one palloc.
 	 */
-	pbuflen = nfields;		/* count the null terminators themselves */
+	pbuflen = nfields;			/* count the null terminators themselves */
 	for (i = 0; i < nfields; i++)
 	{
 		int			len = columns[i].len;
diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c
index 66fd0e62cc..e3b9223b3e 100644
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@ -109,17 +109,17 @@ PG_FUNCTION_INFO_V1(file_fdw_validator);
  * FDW callback routines
  */
 static void fileGetForeignRelSize(PlannerInfo *root,
-								  RelOptInfo *baserel,
-								  Oid foreigntableid);
+					  RelOptInfo *baserel,
+					  Oid foreigntableid);
 static void fileGetForeignPaths(PlannerInfo *root,
-								RelOptInfo *baserel,
-								Oid foreigntableid);
+					RelOptInfo *baserel,
+					Oid foreigntableid);
 static ForeignScan *fileGetForeignPlan(PlannerInfo *root,
-									   RelOptInfo *baserel,
-									   Oid foreigntableid,
-									   ForeignPath *best_path,
-									   List *tlist,
-									   List *scan_clauses);
+				   RelOptInfo *baserel,
+				   Oid foreigntableid,
+				   ForeignPath *best_path,
+				   List *tlist,
+				   List *scan_clauses);
 static void fileExplainForeignScan(ForeignScanState *node, ExplainState *es);
 static void fileBeginForeignScan(ForeignScanState *node, int eflags);
 static TupleTableSlot *fileIterateForeignScan(ForeignScanState *node);
@@ -141,7 +141,7 @@ static void estimate_size(PlannerInfo *root, RelOptInfo *baserel,
 static void estimate_costs(PlannerInfo *root, RelOptInfo *baserel,
 			   FileFdwPlanState *fdw_private,
 			   Cost *startup_cost, Cost *total_cost);
-static int	file_acquire_sample_rows(Relation onerel, int elevel,
+static int file_acquire_sample_rows(Relation onerel, int elevel,
 						 HeapTuple *rows, int targrows,
 						 double *totalrows, double *totaldeadrows);
 
@@ -180,7 +180,7 @@ file_fdw_validator(PG_FUNCTION_ARGS)
 	List	   *options_list = untransformRelOptions(PG_GETARG_DATUM(0));
 	Oid			catalog = PG_GETARG_OID(1);
 	char	   *filename = NULL;
-	DefElem	   *force_not_null = NULL;
+	DefElem    *force_not_null = NULL;
 	List	   *other_options = NIL;
 	ListCell   *cell;
 
@@ -233,7 +233,7 @@ file_fdw_validator(PG_FUNCTION_ARGS)
 					 buf.len > 0
 					 ? errhint("Valid options in this context are: %s",
 							   buf.data)
-					 : errhint("There are no valid options in this context.")));
+				  : errhint("There are no valid options in this context.")));
 		}
 
 		/*
@@ -393,13 +393,13 @@ get_file_fdw_attribute_options(Oid relid)
 		options = GetForeignColumnOptions(relid, attnum);
 		foreach(lc, options)
 		{
-			DefElem	   *def = (DefElem *) lfirst(lc);
+			DefElem    *def = (DefElem *) lfirst(lc);
 
 			if (strcmp(def->defname, "force_not_null") == 0)
 			{
 				if (defGetBoolean(def))
 				{
-					char   *attname = pstrdup(NameStr(attr->attname));
+					char	   *attname = pstrdup(NameStr(attr->attname));
 
 					fnncolumns = lappend(fnncolumns, makeString(attname));
 				}
@@ -429,8 +429,8 @@ fileGetForeignRelSize(PlannerInfo *root,
 	FileFdwPlanState *fdw_private;
 
 	/*
-	 * Fetch options.  We only need filename at this point, but we might
-	 * as well get everything and not need to re-fetch it later in planning.
+	 * Fetch options.  We only need filename at this point, but we might as
+	 * well get everything and not need to re-fetch it later in planning.
 	 */
 	fdw_private = (FileFdwPlanState *) palloc(sizeof(FileFdwPlanState));
 	fileGetOptions(foreigntableid,
@@ -468,13 +468,14 @@ fileGetForeignPaths(PlannerInfo *root,
 									 baserel->rows,
 									 startup_cost,
 									 total_cost,
-									 NIL, /* no pathkeys */
-									 NULL, /* no outer rel either */
-									 NIL)); /* no fdw_private data */
+									 NIL,		/* no pathkeys */
+									 NULL,		/* no outer rel either */
+									 NIL));		/* no fdw_private data */
 
 	/*
 	 * If data file was sorted, and we knew it somehow, we could insert
-	 * appropriate pathkeys into the ForeignPath node to tell the planner that.
+	 * appropriate pathkeys into the ForeignPath node to tell the planner
+	 * that.
 	 */
 }
 
@@ -505,8 +506,8 @@ fileGetForeignPlan(PlannerInfo *root,
 	return make_foreignscan(tlist,
 							scan_clauses,
 							scan_relid,
-							NIL, /* no expressions to evaluate */
-							NIL); /* no private state either */
+							NIL,	/* no expressions to evaluate */
+							NIL);		/* no private state either */
 }
 
 /*
@@ -665,14 +666,14 @@ fileAnalyzeForeignTable(Relation relation,
 {
 	char	   *filename;
 	List	   *options;
-	struct stat	stat_buf;
+	struct stat stat_buf;
 
 	/* Fetch options of foreign table */
 	fileGetOptions(RelationGetRelid(relation), &filename, &options);
 
 	/*
-	 * Get size of the file.  (XXX if we fail here, would it be better to
-	 * just return false to skip analyzing the table?)
+	 * Get size of the file.  (XXX if we fail here, would it be better to just
+	 * return false to skip analyzing the table?)
 	 */
 	if (stat(filename, &stat_buf) < 0)
 		ereport(ERROR,
@@ -746,7 +747,7 @@ estimate_size(PlannerInfo *root, RelOptInfo *baserel,
 		 * planner's idea of the relation width; which is bogus if not all
 		 * columns are being read, not to mention that the text representation
 		 * of a row probably isn't the same size as its internal
-		 * representation.  Possibly we could do something better, but the
+		 * representation.	Possibly we could do something better, but the
 		 * real answer to anyone who complains is "ANALYZE" ...
 		 */
 		int			tuple_width;
@@ -811,7 +812,7 @@ estimate_costs(PlannerInfo *root, RelOptInfo *baserel,
  * which must have at least targrows entries.
  * The actual number of rows selected is returned as the function result.
  * We also count the total number of rows in the file and return it into
- * *totalrows.  Note that *totaldeadrows is always set to 0.
+ * *totalrows.	Note that *totaldeadrows is always set to 0.
  *
  * Note that the returned list of rows is not always in order by physical
  * position in the file.  Therefore, correlation estimates derived later
@@ -824,7 +825,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
 						 double *totalrows, double *totaldeadrows)
 {
 	int			numrows = 0;
-	double		rowstoskip = -1; /* -1 means not set yet */
+	double		rowstoskip = -1;	/* -1 means not set yet */
 	double		rstate;
 	TupleDesc	tupDesc;
 	Datum	   *values;
@@ -853,8 +854,8 @@ file_acquire_sample_rows(Relation onerel, int elevel,
 	cstate = BeginCopyFrom(onerel, filename, NIL, options);
 
 	/*
-	 * Use per-tuple memory context to prevent leak of memory used to read rows
-	 * from the file with Copy routines.
+	 * Use per-tuple memory context to prevent leak of memory used to read
+	 * rows from the file with Copy routines.
 	 */
 	tupcontext = AllocSetContextCreate(CurrentMemoryContext,
 									   "file_fdw temporary context",
@@ -912,10 +913,10 @@ file_acquire_sample_rows(Relation onerel, int elevel,
 			if (rowstoskip <= 0)
 			{
 				/*
-				 * Found a suitable tuple, so save it, replacing one
-				 * old tuple at random
+				 * Found a suitable tuple, so save it, replacing one old tuple
+				 * at random
 				 */
-				int		k = (int) (targrows * anl_random_fract());
+				int			k = (int) (targrows * anl_random_fract());
 
 				Assert(k >= 0 && k < targrows);
 				heap_freetuple(rows[k]);
diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c
index 20977805c8..a226101bbc 100644
--- a/contrib/pg_archivecleanup/pg_archivecleanup.c
+++ b/contrib/pg_archivecleanup/pg_archivecleanup.c
@@ -37,7 +37,7 @@ const char *progname;
 /* Options and defaults */
 bool		debug = false;		/* are we debugging? */
 bool		dryrun = false;		/* are we performing a dry-run operation? */
-char	   *additional_ext = NULL;	/* Extension to remove from filenames */
+char	   *additional_ext = NULL;		/* Extension to remove from filenames */
 
 char	   *archiveLocation;	/* where to find the archive? */
 char	   *restartWALFileName; /* the file from which we can restart restore */
@@ -136,12 +136,13 @@ CleanupPriorWALFiles(void)
 			 * they were originally written, in case this worries you.
 			 */
 			if (strlen(walfile) == XLOG_DATA_FNAME_LEN &&
-			strspn(walfile, "0123456789ABCDEF") == XLOG_DATA_FNAME_LEN &&
+				strspn(walfile, "0123456789ABCDEF") == XLOG_DATA_FNAME_LEN &&
 				strcmp(walfile + 8, exclusiveCleanupFileName + 8) < 0)
 			{
-				/* 
-				 * Use the original file name again now, including any extension
-				 * that might have been chopped off before testing the sequence.
+				/*
+				 * Use the original file name again now, including any
+				 * extension that might have been chopped off before testing
+				 * the sequence.
 				 */
 				snprintf(WALFilePath, MAXPGPATH, "%s/%s",
 						 archiveLocation, xlde->d_name);
@@ -150,7 +151,7 @@ CleanupPriorWALFiles(void)
 				{
 					/*
 					 * Prints the name of the file to be removed and skips the
-					 * actual removal.  The regular printout is so that the
+					 * actual removal.	The regular printout is so that the
 					 * user can pipe the output into some other program.
 					 */
 					printf("%s\n", WALFilePath);
@@ -298,7 +299,8 @@ main(int argc, char **argv)
 				dryrun = true;
 				break;
 			case 'x':
-				additional_ext = optarg; /* Extension to remove from xlogfile names */
+				additional_ext = optarg;		/* Extension to remove from
+												 * xlogfile names */
 				break;
 			default:
 				fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 06869fa344..aa11c144d6 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -103,19 +103,19 @@ typedef struct Counters
 	int64		calls;			/* # of times executed */
 	double		total_time;		/* total execution time, in msec */
 	int64		rows;			/* total # of retrieved or affected rows */
-	int64		shared_blks_hit;		/* # of shared buffer hits */
+	int64		shared_blks_hit;	/* # of shared buffer hits */
 	int64		shared_blks_read;		/* # of shared disk blocks read */
 	int64		shared_blks_dirtied;	/* # of shared disk blocks dirtied */
 	int64		shared_blks_written;	/* # of shared disk blocks written */
-	int64		local_blks_hit;			/* # of local buffer hits */
-	int64		local_blks_read;		/* # of local disk blocks read */
+	int64		local_blks_hit; /* # of local buffer hits */
+	int64		local_blks_read;	/* # of local disk blocks read */
 	int64		local_blks_dirtied;		/* # of local disk blocks dirtied */
 	int64		local_blks_written;		/* # of local disk blocks written */
-	int64		temp_blks_read;			/* # of temp blocks read */
+	int64		temp_blks_read; /* # of temp blocks read */
 	int64		temp_blks_written;		/* # of temp blocks written */
-	double		blk_read_time;			/* time spent reading, in msec */
-	double		blk_write_time;			/* time spent writing, in msec */
-	double		usage;					/* usage factor */
+	double		blk_read_time;	/* time spent reading, in msec */
+	double		blk_write_time; /* time spent writing, in msec */
+	double		usage;			/* usage factor */
 } Counters;
 
 /*
@@ -140,7 +140,7 @@ typedef struct pgssSharedState
 {
 	LWLockId	lock;			/* protects hashtable search/modification */
 	int			query_size;		/* max query length in bytes */
-	double		cur_median_usage;	/* current median usage in hashtable */
+	double		cur_median_usage;		/* current median usage in hashtable */
 } pgssSharedState;
 
 /*
@@ -150,7 +150,7 @@ typedef struct pgssLocationLen
 {
 	int			location;		/* start offset in query text */
 	int			length;			/* length in bytes, or -1 to ignore */
-}	pgssLocationLen;
+} pgssLocationLen;
 
 /*
  * Working state for computing a query jumble and producing a normalized
@@ -172,7 +172,7 @@ typedef struct pgssJumbleState
 
 	/* Current number of valid entries in clocations array */
 	int			clocations_count;
-}	pgssJumbleState;
+} pgssJumbleState;
 
 /*---- Local variables ----*/
 
@@ -248,21 +248,21 @@ static uint32 pgss_hash_string(const char *str);
 static void pgss_store(const char *query, uint32 queryId,
 		   double total_time, uint64 rows,
 		   const BufferUsage *bufusage,
-		   pgssJumbleState * jstate);
+		   pgssJumbleState *jstate);
 static Size pgss_memsize(void);
 static pgssEntry *entry_alloc(pgssHashKey *key, const char *query,
-							  int query_len, bool sticky);
+			int query_len, bool sticky);
 static void entry_dealloc(void);
 static void entry_reset(void);
-static void AppendJumble(pgssJumbleState * jstate,
+static void AppendJumble(pgssJumbleState *jstate,
 			 const unsigned char *item, Size size);
-static void JumbleQuery(pgssJumbleState * jstate, Query *query);
-static void JumbleRangeTable(pgssJumbleState * jstate, List *rtable);
-static void JumbleExpr(pgssJumbleState * jstate, Node *node);
-static void RecordConstLocation(pgssJumbleState * jstate, int location);
-static char *generate_normalized_query(pgssJumbleState * jstate, const char *query,
+static void JumbleQuery(pgssJumbleState *jstate, Query *query);
+static void JumbleRangeTable(pgssJumbleState *jstate, List *rtable);
+static void JumbleExpr(pgssJumbleState *jstate, Node *node);
+static void RecordConstLocation(pgssJumbleState *jstate, int location);
+static char *generate_normalized_query(pgssJumbleState *jstate, const char *query,
 						  int *query_len_p, int encoding);
-static void fill_in_constant_lengths(pgssJumbleState * jstate, const char *query);
+static void fill_in_constant_lengths(pgssJumbleState *jstate, const char *query);
 static int	comp_location(const void *a, const void *b);
 
 
@@ -513,8 +513,8 @@ pgss_shmem_startup(void)
 	FreeFile(file);
 
 	/*
-	 * Remove the file so it's not included in backups/replication
-	 * slaves, etc. A new file will be written on next shutdown.
+	 * Remove the file so it's not included in backups/replication slaves,
+	 * etc. A new file will be written on next shutdown.
 	 */
 	unlink(PGSS_DUMP_FILE);
 
@@ -600,7 +600,7 @@ error:
 	ereport(LOG,
 			(errcode_for_file_access(),
 			 errmsg("could not write pg_stat_statement file \"%s\": %m",
-					PGSS_DUMP_FILE  ".tmp")));
+					PGSS_DUMP_FILE ".tmp")));
 	if (file)
 		FreeFile(file);
 	unlink(PGSS_DUMP_FILE ".tmp");
@@ -626,8 +626,8 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query)
 	 * the statement contains an optimizable statement for which a queryId
 	 * could be derived (such as EXPLAIN or DECLARE CURSOR).  For such cases,
 	 * runtime control will first go through ProcessUtility and then the
-	 * executor, and we don't want the executor hooks to do anything, since
-	 * we are already measuring the statement's costs at the utility level.
+	 * executor, and we don't want the executor hooks to do anything, since we
+	 * are already measuring the statement's costs at the utility level.
 	 */
 	if (query->utilityStmt)
 	{
@@ -768,7 +768,7 @@ pgss_ExecutorEnd(QueryDesc *queryDesc)
 
 		pgss_store(queryDesc->sourceText,
 				   queryId,
-				   queryDesc->totaltime->total * 1000.0, /* convert to msec */
+				   queryDesc->totaltime->total * 1000.0,		/* convert to msec */
 				   queryDesc->estate->es_processed,
 				   &queryDesc->totaltime->bufusage,
 				   NULL);
@@ -789,10 +789,9 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString,
 					DestReceiver *dest, char *completionTag)
 {
 	/*
-	 * If it's an EXECUTE statement, we don't track it and don't increment
-	 * the nesting level.  This allows the cycles to be charged to the
-	 * underlying PREPARE instead (by the Executor hooks), which is much more
-	 * useful.
+	 * If it's an EXECUTE statement, we don't track it and don't increment the
+	 * nesting level.  This allows the cycles to be charged to the underlying
+	 * PREPARE instead (by the Executor hooks), which is much more useful.
 	 *
 	 * We also don't track execution of PREPARE.  If we did, we would get one
 	 * hash table entry for the PREPARE (with hash calculated from the query
@@ -942,7 +941,7 @@ static void
 pgss_store(const char *query, uint32 queryId,
 		   double total_time, uint64 rows,
 		   const BufferUsage *bufusage,
-		   pgssJumbleState * jstate)
+		   pgssJumbleState *jstate)
 {
 	pgssHashKey key;
 	pgssEntry  *entry;
@@ -1355,7 +1354,7 @@ entry_reset(void)
  * the current jumble.
  */
 static void
-AppendJumble(pgssJumbleState * jstate, const unsigned char *item, Size size)
+AppendJumble(pgssJumbleState *jstate, const unsigned char *item, Size size)
 {
 	unsigned char *jumble = jstate->jumble;
 	Size		jumble_len = jstate->jumble_len;
@@ -1404,7 +1403,7 @@ AppendJumble(pgssJumbleState * jstate, const unsigned char *item, Size size)
  * of information).
  */
 static void
-JumbleQuery(pgssJumbleState * jstate, Query *query)
+JumbleQuery(pgssJumbleState *jstate, Query *query)
 {
 	Assert(IsA(query, Query));
 	Assert(query->utilityStmt == NULL);
@@ -1431,7 +1430,7 @@ JumbleQuery(pgssJumbleState * jstate, Query *query)
  * Jumble a range table
  */
 static void
-JumbleRangeTable(pgssJumbleState * jstate, List *rtable)
+JumbleRangeTable(pgssJumbleState *jstate, List *rtable)
 {
 	ListCell   *lc;
 
@@ -1485,11 +1484,11 @@ JumbleRangeTable(pgssJumbleState * jstate, List *rtable)
  *
  * Note: the reason we don't simply use expression_tree_walker() is that the
  * point of that function is to support tree walkers that don't care about
- * most tree node types, but here we care about all types.  We should complain
+ * most tree node types, but here we care about all types.	We should complain
  * about any unrecognized node type.
  */
 static void
-JumbleExpr(pgssJumbleState * jstate, Node *node)
+JumbleExpr(pgssJumbleState *jstate, Node *node)
 {
 	ListCell   *temp;
 
@@ -1874,7 +1873,7 @@ JumbleExpr(pgssJumbleState * jstate, Node *node)
  * that is currently being walked.
  */
 static void
-RecordConstLocation(pgssJumbleState * jstate, int location)
+RecordConstLocation(pgssJumbleState *jstate, int location)
 {
 	/* -1 indicates unknown or undefined location */
 	if (location >= 0)
@@ -1909,7 +1908,7 @@ RecordConstLocation(pgssJumbleState * jstate, int location)
  * Returns a palloc'd string, which is not necessarily null-terminated.
  */
 static char *
-generate_normalized_query(pgssJumbleState * jstate, const char *query,
+generate_normalized_query(pgssJumbleState *jstate, const char *query,
 						  int *query_len_p, int encoding)
 {
 	char	   *norm_query;
@@ -2007,7 +2006,7 @@ generate_normalized_query(pgssJumbleState * jstate, const char *query,
  * a problem.
  *
  * Duplicate constant pointers are possible, and will have their lengths
- * marked as '-1', so that they are later ignored.  (Actually, we assume the
+ * marked as '-1', so that they are later ignored.	(Actually, we assume the
  * lengths were initialized as -1 to start with, and don't change them here.)
  *
  * N.B. There is an assumption that a '-' character at a Const location begins
@@ -2015,7 +2014,7 @@ generate_normalized_query(pgssJumbleState * jstate, const char *query,
  * reason for a constant to start with a '-'.
  */
 static void
-fill_in_constant_lengths(pgssJumbleState * jstate, const char *query)
+fill_in_constant_lengths(pgssJumbleState *jstate, const char *query)
 {
 	pgssLocationLen *locs;
 	core_yyscan_t yyscanner;
diff --git a/contrib/pg_test_fsync/pg_test_fsync.c b/contrib/pg_test_fsync/pg_test_fsync.c
index 7f92bc8818..9fe2301e41 100644
--- a/contrib/pg_test_fsync/pg_test_fsync.c
+++ b/contrib/pg_test_fsync/pg_test_fsync.c
@@ -29,7 +29,7 @@
 
 /* These are macros to avoid timing the function call overhead. */
 #ifndef WIN32
-#define START_TIMER	\
+#define START_TIMER \
 do { \
 	alarm_triggered = false; \
 	alarm(secs_per_test); \
@@ -37,7 +37,7 @@ do { \
 } while (0)
 #else
 /* WIN32 doesn't support alarm, so we create a thread and sleep there */
-#define START_TIMER	\
+#define START_TIMER \
 do { \
 	alarm_triggered = false; \
 	if (CreateThread(NULL, 0, process_alarm, NULL, 0, NULL) == \
@@ -55,7 +55,7 @@ do { \
 	gettimeofday(&stop_t, NULL); \
 	print_elapse(start_t, stop_t, ops); \
 } while (0)
-		
+
 
 static const char *progname;
 
@@ -77,6 +77,7 @@ static void test_sync(int writes_per_op);
 static void test_open_syncs(void);
 static void test_open_sync(const char *msg, int writes_size);
 static void test_file_descriptor_sync(void);
+
 #ifndef WIN32
 static void process_alarm(int sig);
 #else
diff --git a/contrib/pg_test_timing/pg_test_timing.c b/contrib/pg_test_timing/pg_test_timing.c
index 4e43694338..b3f98abe5c 100644
--- a/contrib/pg_test_timing/pg_test_timing.c
+++ b/contrib/pg_test_timing/pg_test_timing.c
@@ -1,7 +1,7 @@
 /*
  *	pg_test_timing.c
- *		tests overhead of timing calls and their monotonicity:  that
- * 		they always move forward
+ *		tests overhead of timing calls and their monotonicity:	that
+ *		they always move forward
  */
 
 #include "postgres_fe.h"
@@ -35,8 +35,8 @@ handle_args(int argc, char *argv[])
 		{"duration", required_argument, NULL, 'd'},
 		{NULL, 0, NULL, 0}
 	};
-	int option;			/* Command line option */
-	int	optindex = 0;	/* used by getopt_long */
+	int			option;			/* Command line option */
+	int			optindex = 0;	/* used by getopt_long */
 
 	if (argc > 1)
 	{
@@ -87,7 +87,7 @@ handle_args(int argc, char *argv[])
 	else
 	{
 		fprintf(stderr,
-				"%s: duration must be a positive integer (duration is \"%d\")\n",
+			"%s: duration must be a positive integer (duration is \"%d\")\n",
 				progname, test_duration);
 		fprintf(stderr, "Try \"%s --help\" for more information.\n",
 				progname);
@@ -98,16 +98,22 @@ handle_args(int argc, char *argv[])
 static void
 test_timing(int32 duration)
 {
-	uint64 total_time;
-	int64 time_elapsed = 0;
-	uint64 loop_count = 0;
-	uint64 prev, cur;
-	int32 diff, i, bits, found;
-
-	instr_time start_time, end_time, temp;
+	uint64		total_time;
+	int64		time_elapsed = 0;
+	uint64		loop_count = 0;
+	uint64		prev,
+				cur;
+	int32		diff,
+				i,
+				bits,
+				found;
+
+	instr_time	start_time,
+				end_time,
+				temp;
 
 	static int64 histogram[32];
-	char	buf[100];
+	char		buf[100];
 
 	total_time = duration > 0 ? duration * 1000000 : 0;
 
@@ -146,7 +152,7 @@ test_timing(int32 duration)
 	INSTR_TIME_SUBTRACT(end_time, start_time);
 
 	printf("Per loop time including overhead: %0.2f nsec\n",
-			INSTR_TIME_GET_DOUBLE(end_time) * 1e9 / loop_count);
+		   INSTR_TIME_GET_DOUBLE(end_time) * 1e9 / loop_count);
 	printf("Histogram of timing durations:\n");
 	printf("%9s: %10s %9s\n", "< usec", "count", "percent");
 
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index 57bce01207..d59c8eb670 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -199,9 +199,9 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
 	 * trigram extraction is relatively CPU-expensive.	We must include
 	 * strategy number because trigram extraction depends on strategy.
 	 *
-	 * The cached structure contains the strategy number, then the input
-	 * query (starting at a MAXALIGN boundary), then the TRGM value (also
-	 * starting at a MAXALIGN boundary).
+	 * The cached structure contains the strategy number, then the input query
+	 * (starting at a MAXALIGN boundary), then the TRGM value (also starting
+	 * at a MAXALIGN boundary).
 	 */
 	if (cache == NULL ||
 		strategy != *((StrategyNumber *) cache) ||
@@ -341,8 +341,7 @@ gtrgm_distance(PG_FUNCTION_ARGS)
 	char	   *cache = (char *) fcinfo->flinfo->fn_extra;
 
 	/*
-	 * Cache the generated trigrams across multiple calls with the same
-	 * query.
+	 * Cache the generated trigrams across multiple calls with the same query.
 	 */
 	if (cache == NULL ||
 		VARSIZE(cache) != querysize ||
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 2669c09658..eed4a1eba7 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -168,7 +168,7 @@ issue_warnings(char *sequence_script_file_name)
 					  SYSTEMQUOTE "\"%s/psql\" --echo-queries "
 					  "--set ON_ERROR_STOP=on "
 					  "--no-psqlrc --port %d --username \"%s\" "
-					  "-f \"%s\" --dbname template1 >> \"%s\" 2>&1" SYSTEMQUOTE,
+				   "-f \"%s\" --dbname template1 >> \"%s\" 2>&1" SYSTEMQUOTE,
 					  new_cluster.bindir, new_cluster.port, os_info.user,
 					  sequence_script_file_name, UTILITY_LOG_FILE);
 			unlink(sequence_script_file_name);
@@ -204,7 +204,7 @@ output_completion_banner(char *analyze_script_file_name,
 	else
 		pg_log(PG_REPORT,
 			   "Optimizer statistics and free space information are not transferred\n"
-			   "by pg_upgrade so, once you start the new server, consider running:\n"
+		"by pg_upgrade so, once you start the new server, consider running:\n"
 			   "    %s\n\n", analyze_script_file_name);
 
 	pg_log(PG_REPORT,
@@ -238,7 +238,8 @@ check_cluster_versions(void)
 
 	/*
 	 * We can't allow downgrading because we use the target pg_dumpall, and
-	 * pg_dumpall cannot operate on new database versions, only older versions.
+	 * pg_dumpall cannot operate on new database versions, only older
+	 * versions.
 	 */
 	if (old_cluster.major_version > new_cluster.major_version)
 		pg_log(PG_FATAL, "This utility cannot be used to downgrade to older major PostgreSQL versions.\n");
@@ -402,31 +403,31 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
 #endif
 
 	fprintf(script, "echo %sThis script will generate minimal optimizer statistics rapidly%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %sso your system is usable, and then gather statistics twice more%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %swith increasing accuracy.  When it is done, your system will%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %shave the default level of optimizer statistics.%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo\n\n");
 
 	fprintf(script, "echo %sIf you have used ALTER TABLE to modify the statistics target for%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %sany tables, you might want to remove them and restore them after%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %srunning this script because they will delay fast statistics generation.%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo\n\n");
 
 	fprintf(script, "echo %sIf you would like default statistics as quickly as possible, cancel%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %sthis script and run:%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %s    vacuumdb --all %s%s\n", ECHO_QUOTE,
-		/* Did we copy the free space files? */
-		(GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
-		"--analyze-only" : "--analyze", ECHO_QUOTE);
+	/* Did we copy the free space files? */
+			(GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
+			"--analyze-only" : "--analyze", ECHO_QUOTE);
 	fprintf(script, "echo\n\n");
 
 #ifndef WIN32
@@ -441,15 +442,15 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
 #endif
 
 	fprintf(script, "echo %sGenerating minimal optimizer statistics (1 target)%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %s--------------------------------------------------%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "vacuumdb --all --analyze-only\n");
 	fprintf(script, "echo\n");
 	fprintf(script, "echo %sThe server is now available with minimal optimizer statistics.%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %sQuery performance will be optimal once this script completes.%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo\n\n");
 
 #ifndef WIN32
@@ -462,9 +463,9 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
 #endif
 
 	fprintf(script, "echo %sGenerating medium optimizer statistics (10 targets)%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %s---------------------------------------------------%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "vacuumdb --all --analyze-only\n");
 	fprintf(script, "echo\n\n");
 
@@ -475,17 +476,17 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
 #endif
 
 	fprintf(script, "echo %sGenerating default (full) optimizer statistics (100 targets?)%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "echo %s-------------------------------------------------------------%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 	fprintf(script, "vacuumdb --all %s\n",
-		/* Did we copy the free space files? */
-		(GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
-		"--analyze-only" : "--analyze");
+	/* Did we copy the free space files? */
+			(GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
+			"--analyze-only" : "--analyze");
 
 	fprintf(script, "echo\n\n");
 	fprintf(script, "echo %sDone%s\n",
-					ECHO_QUOTE, ECHO_QUOTE);
+			ECHO_QUOTE, ECHO_QUOTE);
 
 	fclose(script);
 
@@ -716,8 +717,8 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
 		pg_log(PG_REPORT, "fatal\n");
 		pg_log(PG_FATAL,
 			   "Your installation contains \"contrib/isn\" functions which rely on the\n"
-			   "bigint data type.  Your old and new clusters pass bigint values\n"
-			   "differently so this cluster cannot currently be upgraded.  You can\n"
+		  "bigint data type.  Your old and new clusters pass bigint values\n"
+		"differently so this cluster cannot currently be upgraded.  You can\n"
 			   "manually upgrade databases that use \"contrib/isn\" facilities and remove\n"
 			   "\"contrib/isn\" from the old cluster and restart the upgrade.  A list of\n"
 			   "the problem functions is in the file:\n"
@@ -764,9 +765,9 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
 		PGconn	   *conn = connectToServer(cluster, active_db->db_name);
 
 		/*
-		 *	While several relkinds don't store any data, e.g. views, they
-		 *	can be used to define data types of other columns, so we
-		 *	check all relkinds.
+		 * While several relkinds don't store any data, e.g. views, they can
+		 * be used to define data types of other columns, so we check all
+		 * relkinds.
 		 */
 		res = executeQueryOrDie(conn,
 								"SELECT n.nspname, c.relname, a.attname "
@@ -777,16 +778,16 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
 								"		NOT a.attisdropped AND "
 								"		a.atttypid IN ( "
 		  "			'pg_catalog.regproc'::pg_catalog.regtype, "
-		  "			'pg_catalog.regprocedure'::pg_catalog.regtype, "
+								"			'pg_catalog.regprocedure'::pg_catalog.regtype, "
 		  "			'pg_catalog.regoper'::pg_catalog.regtype, "
-		  "			'pg_catalog.regoperator'::pg_catalog.regtype, "
+								"			'pg_catalog.regoperator'::pg_catalog.regtype, "
 		/* regclass.oid is preserved, so 'regclass' is OK */
 		/* regtype.oid is preserved, so 'regtype' is OK */
-		  "			'pg_catalog.regconfig'::pg_catalog.regtype, "
-		  "			'pg_catalog.regdictionary'::pg_catalog.regtype) AND "
-		  "		c.relnamespace = n.oid AND "
-		  "		n.nspname != 'pg_catalog' AND "
-		  "		n.nspname != 'information_schema'");
+		"			'pg_catalog.regconfig'::pg_catalog.regtype, "
+								"			'pg_catalog.regdictionary'::pg_catalog.regtype) AND "
+								"		c.relnamespace = n.oid AND "
+							  "		n.nspname != 'pg_catalog' AND "
+						 "		n.nspname != 'information_schema'");
 
 		ntups = PQntuples(res);
 		i_nspname = PQfnumber(res, "nspname");
@@ -822,8 +823,8 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
 		pg_log(PG_REPORT, "fatal\n");
 		pg_log(PG_FATAL,
 			   "Your installation contains one of the reg* data types in user tables.\n"
-			   "These data types reference system OIDs that are not preserved by\n"
-			   "pg_upgrade, so this cluster cannot currently be upgraded.  You can\n"
+		 "These data types reference system OIDs that are not preserved by\n"
+		"pg_upgrade, so this cluster cannot currently be upgraded.  You can\n"
 			   "remove the problem tables and restart the upgrade.  A list of the problem\n"
 			   "columns is in the file:\n"
 			   "    %s\n\n", output_path);
@@ -836,9 +837,11 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
 static void
 get_bin_version(ClusterInfo *cluster)
 {
-	char		cmd[MAXPGPATH], cmd_output[MAX_STRING];
+	char		cmd[MAXPGPATH],
+				cmd_output[MAX_STRING];
 	FILE	   *output;
-	int			pre_dot, post_dot;
+	int			pre_dot,
+				post_dot;
 
 	snprintf(cmd, sizeof(cmd), "\"%s/pg_ctl\" --version", cluster->bindir);
 
@@ -858,4 +861,3 @@ get_bin_version(ClusterInfo *cluster)
 
 	cluster->bin_version = (pre_dot * 100 + post_dot) * 100;
 }
-
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index e01280db9e..6bffe549e5 100644
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -129,6 +129,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 		pg_log(PG_VERBOSE, "%s", bufin);
 
 #ifdef WIN32
+
 		/*
 		 * Due to an installer bug, LANG=C doesn't work for PG 8.3.3, but does
 		 * work 8.2.6 and 8.3.7, so check for non-ASCII output and suggest a
@@ -506,7 +507,7 @@ check_control_data(ControlData *oldctrl,
 		 * This is a common 8.3 -> 8.4 upgrade problem, so we are more verbose
 		 */
 		pg_log(PG_FATAL,
-			   "You will need to rebuild the new server with configure option\n"
+			"You will need to rebuild the new server with configure option\n"
 			   "--disable-integer-datetimes or get server binaries built with those\n"
 			   "options.\n");
 	}
@@ -531,6 +532,6 @@ disable_old_cluster(void)
 	pg_log(PG_REPORT, "\n"
 		   "If you want to start the old cluster, you will need to remove\n"
 		   "the \".old\" suffix from %s/global/pg_control.old.\n"
-		   "Because \"link\" mode was used, the old cluster cannot be safely\n"
-		   "started once the new cluster has been started.\n\n", old_cluster.pgdata);
+		 "Because \"link\" mode was used, the old cluster cannot be safely\n"
+	"started once the new cluster has been started.\n\n", old_cluster.pgdata);
 }
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index 68cf0795aa..9e63bd5856 100644
--- a/contrib/pg_upgrade/exec.c
+++ b/contrib/pg_upgrade/exec.c
@@ -18,8 +18,9 @@
 static void check_data_dir(const char *pg_data);
 static void check_bin_dir(ClusterInfo *cluster);
 static void validate_exec(const char *dir, const char *cmdName);
+
 #ifdef WIN32
-static int win32_check_directory_write_permissions(void);
+static int	win32_check_directory_write_permissions(void);
 #endif
 
 
@@ -64,7 +65,7 @@ exec_prog(bool throw_error, bool is_priv,
 		pg_log(throw_error ? PG_FATAL : PG_REPORT,
 			   "Consult the last few lines of \"%s\" for\n"
 			   "the probable cause of the failure.\n",
-				log_file);
+			   log_file);
 		return 1;
 	}
 
@@ -142,12 +143,12 @@ verify_directories(void)
 static int
 win32_check_directory_write_permissions(void)
 {
-	int fd;
+	int			fd;
 
 	/*
-	 *	We open a file we would normally create anyway.  We do this even in
-	 *	'check' mode, which isn't ideal, but this is the best we can do.
-	 */	
+	 * We open a file we would normally create anyway.	We do this even in
+	 * 'check' mode, which isn't ideal, but this is the best we can do.
+	 */
 	if ((fd = open(GLOBALS_DUMP_FILE, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)) < 0)
 		return -1;
 	close(fd);
@@ -184,7 +185,7 @@ check_data_dir(const char *pg_data)
 		struct stat statBuf;
 
 		snprintf(subDirName, sizeof(subDirName), "%s%s%s", pg_data,
-			/* Win32 can't stat() a directory with a trailing slash. */
+		/* Win32 can't stat() a directory with a trailing slash. */
 				 *requiredSubdirs[subdirnum] ? "/" : "",
 				 requiredSubdirs[subdirnum]);
 
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index 0276636e03..1dd3722142 100644
--- a/contrib/pg_upgrade/file.c
+++ b/contrib/pg_upgrade/file.c
@@ -233,7 +233,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
  * large number of times.
  */
 int
-load_directory(const char *dirname, struct dirent ***namelist)
+load_directory(const char *dirname, struct dirent *** namelist)
 {
 	DIR		   *dirdesc;
 	struct dirent *direntry;
@@ -251,7 +251,7 @@ load_directory(const char *dirname, struct dirent ***namelist)
 		count++;
 
 		*namelist = (struct dirent **) realloc((void *) (*namelist),
-					(size_t) ((name_num + 1) * sizeof(struct dirent *)));
+						(size_t) ((name_num + 1) * sizeof(struct dirent *)));
 
 		if (*namelist == NULL)
 		{
@@ -314,7 +314,6 @@ win32_pghardlink(const char *src, const char *dst)
 	else
 		return 0;
 }
-
 #endif
 
 
@@ -322,13 +321,11 @@ win32_pghardlink(const char *src, const char *dst)
 FILE *
 fopen_priv(const char *path, const char *mode)
 {
-	mode_t old_umask = umask(S_IRWXG | S_IRWXO);
-	FILE	*fp;
+	mode_t		old_umask = umask(S_IRWXG | S_IRWXO);
+	FILE	   *fp;
 
 	fp = fopen(path, mode);
 	umask(old_umask);
 
 	return fp;
 }
-	
-
diff --git a/contrib/pg_upgrade/function.c b/contrib/pg_upgrade/function.c
index b4b17badb2..77bd3a0359 100644
--- a/contrib/pg_upgrade/function.c
+++ b/contrib/pg_upgrade/function.c
@@ -133,7 +133,7 @@ get_loadable_libraries(void)
 	int			totaltups;
 	int			dbnum;
 	bool		found_public_plpython_handler = false;
-	
+
 	ress = (PGresult **) pg_malloc(old_cluster.dbarr.ndbs * sizeof(PGresult *));
 	totaltups = 0;
 
@@ -144,10 +144,10 @@ get_loadable_libraries(void)
 		PGconn	   *conn = connectToServer(&old_cluster, active_db->db_name);
 
 		/*
-		 *	Fetch all libraries referenced in this DB.  We can't exclude
-		 *	the "pg_catalog" schema because, while such functions are not
-		 *	explicitly dumped by pg_dump, they do reference implicit objects
-		 *	that pg_dump does dump, e.g. CREATE LANGUAGE plperl.
+		 * Fetch all libraries referenced in this DB.  We can't exclude the
+		 * "pg_catalog" schema because, while such functions are not
+		 * explicitly dumped by pg_dump, they do reference implicit objects
+		 * that pg_dump does dump, e.g. CREATE LANGUAGE plperl.
 		 */
 		ress[dbnum] = executeQueryOrDie(conn,
 										"SELECT DISTINCT probin "
@@ -158,26 +158,26 @@ get_loadable_libraries(void)
 										FirstNormalObjectId);
 		totaltups += PQntuples(ress[dbnum]);
 
-		 /*
-		  *	Systems that install plpython before 8.1 have
-		  *	plpython_call_handler() defined in the "public" schema, causing
-		  *	pg_dumpall to dump it.  However that function still references
-		  *	"plpython" (no "2"), so it throws an error on restore.  This code
-		  *	checks for the problem function, reports affected databases to the
-		  *	user and explains how to remove them.
-		  *	8.1 git commit: e0dedd0559f005d60c69c9772163e69c204bac69
-		  *	http://archives.postgresql.org/pgsql-hackers/2012-03/msg01101.php
-		  *	http://archives.postgresql.org/pgsql-bugs/2012-05/msg00206.php
-		  */
+		/*
+		 * Systems that install plpython before 8.1 have
+		 * plpython_call_handler() defined in the "public" schema, causing
+		 * pg_dumpall to dump it.  However that function still references
+		 * "plpython" (no "2"), so it throws an error on restore.  This code
+		 * checks for the problem function, reports affected databases to the
+		 * user and explains how to remove them. 8.1 git commit:
+		 * e0dedd0559f005d60c69c9772163e69c204bac69
+		 * http://archives.postgresql.org/pgsql-hackers/2012-03/msg01101.php
+		 * http://archives.postgresql.org/pgsql-bugs/2012-05/msg00206.php
+		 */
 		if (GET_MAJOR_VERSION(old_cluster.major_version) < 901)
 		{
-			PGresult  *res;
+			PGresult   *res;
 
 			res = executeQueryOrDie(conn,
 									"SELECT 1 "
-									"FROM	pg_catalog.pg_proc JOIN pg_namespace "
-									"		ON pronamespace = pg_namespace.oid "
-									"WHERE proname = 'plpython_call_handler' AND "
+						   "FROM	pg_catalog.pg_proc JOIN pg_namespace "
+							 "		ON pronamespace = pg_namespace.oid "
+							   "WHERE proname = 'plpython_call_handler' AND "
 									"nspname = 'public' AND "
 									"prolang = 13 /* C */ AND "
 									"probin = '$libdir/plpython' AND "
@@ -188,23 +188,23 @@ get_loadable_libraries(void)
 				if (!found_public_plpython_handler)
 				{
 					pg_log(PG_WARNING,
-		   "\nThe old cluster has a \"plpython_call_handler\" function defined\n"
-	   		"in the \"public\" schema which is a duplicate of the one defined\n"
-		    "in the \"pg_catalog\" schema.  You can confirm this by executing\n"
-			"in psql:\n"
-			"\n"
-			"	\\df *.plpython_call_handler\n"
-			"\n"
-			"The \"public\" schema version of this function was created by a\n"
-			"pre-8.1 install of plpython, and must be removed for pg_upgrade\n"
-			"to complete because it references a now-obsolete \"plpython\"\n"
-			"shared object file.  You can remove the \"public\" schema version\n"
-			"of this function by running the following command:\n"
-			"\n"
-			"	DROP FUNCTION public.plpython_call_handler()\n"
-			"\n"
-			"in each affected database:\n"
-			"\n");
+						   "\nThe old cluster has a \"plpython_call_handler\" function defined\n"
+						   "in the \"public\" schema which is a duplicate of the one defined\n"
+						   "in the \"pg_catalog\" schema.  You can confirm this by executing\n"
+						   "in psql:\n"
+						   "\n"
+						   "	\\df *.plpython_call_handler\n"
+						   "\n"
+						   "The \"public\" schema version of this function was created by a\n"
+						   "pre-8.1 install of plpython, and must be removed for pg_upgrade\n"
+						   "to complete because it references a now-obsolete \"plpython\"\n"
+						   "shared object file.  You can remove the \"public\" schema version\n"
+					   "of this function by running the following command:\n"
+						   "\n"
+						 "	DROP FUNCTION public.plpython_call_handler()\n"
+						   "\n"
+						   "in each affected database:\n"
+						   "\n");
 				}
 				pg_log(PG_WARNING, "	%s\n", active_db->db_name);
 				found_public_plpython_handler = true;
@@ -217,9 +217,9 @@ get_loadable_libraries(void)
 
 	if (found_public_plpython_handler)
 		pg_log(PG_FATAL,
-		   "Remove the problem functions from the old cluster to continue.\n");
-	
-	totaltups++;	/* reserve for pg_upgrade_support */
+		 "Remove the problem functions from the old cluster to continue.\n");
+
+	totaltups++;				/* reserve for pg_upgrade_support */
 
 	/* Allocate what's certainly enough space */
 	os_info.libraries = (char **) pg_malloc(totaltups * sizeof(char *));
@@ -293,17 +293,17 @@ check_loadable_libraries(void)
 		PGresult   *res;
 
 		/*
-		 *	In Postgres 9.0, Python 3 support was added, and to do that, a
-		 *	plpython2u language was created with library name plpython2.so
-		 *	as a symbolic link to plpython.so.  In Postgres 9.1, only the
-		 *	plpython2.so library was created, and both plpythonu and
-		 *	plpython2u pointing to it.  For this reason, any reference to
-		 *	library name "plpython" in an old PG <= 9.1 cluster must look
-		 *	for "plpython2" in the new cluster.
+		 * In Postgres 9.0, Python 3 support was added, and to do that, a
+		 * plpython2u language was created with library name plpython2.so as a
+		 * symbolic link to plpython.so.  In Postgres 9.1, only the
+		 * plpython2.so library was created, and both plpythonu and plpython2u
+		 * pointing to it.	For this reason, any reference to library name
+		 * "plpython" in an old PG <= 9.1 cluster must look for "plpython2" in
+		 * the new cluster.
 		 *
-		 *	For this case, we could check pg_pltemplate, but that only works
-		 *	for languages, and does not help with function shared objects,
-		 *	so we just do a general fix.
+		 * For this case, we could check pg_pltemplate, but that only works
+		 * for languages, and does not help with function shared objects, so
+		 * we just do a general fix.
 		 */
 		if (GET_MAJOR_VERSION(old_cluster.major_version) < 901 &&
 			strcmp(lib, "$libdir/plpython") == 0)
@@ -325,7 +325,7 @@ check_loadable_libraries(void)
 			/* exit and report missing support library with special message */
 			if (strcmp(lib, PG_UPGRADE_SUPPORT) == 0)
 				pg_log(PG_FATAL,
-				   "The pg_upgrade_support module must be created and installed in the new cluster.\n");
+					   "The pg_upgrade_support module must be created and installed in the new cluster.\n");
 
 			if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
 				pg_log(PG_FATAL, "Could not open file \"%s\": %s\n",
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index 5b2b9eb28c..74b13e782d 100644
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -57,12 +57,12 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
 				   old_db->db_name, old_rel->reloid, new_rel->reloid);
 
 		/*
-		 * TOAST table names initially match the heap pg_class oid.
-		 * In pre-8.4, TOAST table names change during CLUSTER; in pre-9.0,
-		 * TOAST table names change during ALTER TABLE ALTER COLUMN SET TYPE.
-		 * In >= 9.0, TOAST relation names always use heap table oids, hence
-		 * we cannot check relation names when upgrading from pre-9.0.
-		 * Clusters upgraded to 9.0 will get matching TOAST names.
+		 * TOAST table names initially match the heap pg_class oid. In
+		 * pre-8.4, TOAST table names change during CLUSTER; in pre-9.0, TOAST
+		 * table names change during ALTER TABLE ALTER COLUMN SET TYPE. In >=
+		 * 9.0, TOAST relation names always use heap table oids, hence we
+		 * cannot check relation names when upgrading from pre-9.0. Clusters
+		 * upgraded to 9.0 will get matching TOAST names.
 		 */
 		if (strcmp(old_rel->nspname, new_rel->nspname) != 0 ||
 			((GET_MAJOR_VERSION(old_cluster.major_version) >= 900 ||
@@ -194,16 +194,16 @@ get_db_infos(ClusterInfo *cluster)
 	char		query[QUERY_ALLOC];
 
 	snprintf(query, sizeof(query),
-			"SELECT d.oid, d.datname, %s "
-			"FROM pg_catalog.pg_database d "
-			" LEFT OUTER JOIN pg_catalog.pg_tablespace t "
-			" ON d.dattablespace = t.oid "
-			"WHERE d.datallowconn = true "
+			 "SELECT d.oid, d.datname, %s "
+			 "FROM pg_catalog.pg_database d "
+			 " LEFT OUTER JOIN pg_catalog.pg_tablespace t "
+			 " ON d.dattablespace = t.oid "
+			 "WHERE d.datallowconn = true "
 	/* we don't preserve pg_database.oid so we sort by name */
-			"ORDER BY 2",
+			 "ORDER BY 2",
 	/* 9.2 removed the spclocation column */
-			(GET_MAJOR_VERSION(cluster->major_version) <= 901) ?
-			"t.spclocation" : "pg_catalog.pg_tablespace_location(t.oid) AS spclocation");
+			 (GET_MAJOR_VERSION(cluster->major_version) <= 901) ?
+			 "t.spclocation" : "pg_catalog.pg_tablespace_location(t.oid) AS spclocation");
 
 	res = executeQueryOrDie(conn, "%s", query);
 
@@ -276,7 +276,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
 			 "  LEFT OUTER JOIN pg_catalog.pg_tablespace t "
 			 "	   ON c.reltablespace = t.oid "
 			 "WHERE relkind IN ('r','t', 'i'%s) AND "
-			 /* exclude possible orphaned temp tables */
+	/* exclude possible orphaned temp tables */
 			 "  ((n.nspname !~ '^pg_temp_' AND "
 			 "    n.nspname !~ '^pg_toast_temp_' AND "
 			 "    n.nspname NOT IN ('pg_catalog', 'information_schema', 'binary_upgrade') AND "
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
index 66a70cac8a..ccf00434d3 100644
--- a/contrib/pg_upgrade/option.c
+++ b/contrib/pg_upgrade/option.c
@@ -56,10 +56,10 @@ parseCommandLine(int argc, char *argv[])
 	int			option;			/* Command line option */
 	int			optindex = 0;	/* used by getopt_long */
 	int			os_user_effective_id;
-	FILE		*fp;
-	char		**filename;
+	FILE	   *fp;
+	char	  **filename;
 	time_t		run_time = time(NULL);
-	
+
 	user_opts.transfer_mode = TRANSFER_MODE_COPY;
 
 	os_info.progname = get_progname(argv[0]);
@@ -138,11 +138,11 @@ parseCommandLine(int argc, char *argv[])
 				new_cluster.pgopts = pg_strdup(optarg);
 				break;
 
-			/*
-			 * Someday, the port number option could be removed and
-			 * passed using -o/-O, but that requires postmaster -C
-			 * to be supported on all old/new versions.
-			 */
+				/*
+				 * Someday, the port number option could be removed and passed
+				 * using -o/-O, but that requires postmaster -C to be
+				 * supported on all old/new versions.
+				 */
 			case 'p':
 				if ((old_cluster.port = atoi(optarg)) <= 0)
 				{
@@ -196,21 +196,21 @@ parseCommandLine(int argc, char *argv[])
 		/* Start with newline because we might be appending to a file. */
 		fprintf(fp, "\n"
 		"-----------------------------------------------------------------\n"
-		"  pg_upgrade run on %s"
-		"-----------------------------------------------------------------\n\n",
-		ctime(&run_time));
+				"  pg_upgrade run on %s"
+				"-----------------------------------------------------------------\n\n",
+				ctime(&run_time));
 		fclose(fp);
 	}
 
 	/* Get values from env if not already set */
 	check_required_directory(&old_cluster.bindir, "PGBINOLD", "-b",
-							"old cluster binaries reside");
+							 "old cluster binaries reside");
 	check_required_directory(&new_cluster.bindir, "PGBINNEW", "-B",
-							"new cluster binaries reside");
+							 "new cluster binaries reside");
 	check_required_directory(&old_cluster.pgdata, "PGDATAOLD", "-d",
-							"old cluster data resides");
+							 "old cluster data resides");
 	check_required_directory(&new_cluster.pgdata, "PGDATANEW", "-D",
-							"new cluster data resides");
+							 "new cluster data resides");
 }
 
 
@@ -285,7 +285,7 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user);
  */
 static void
 check_required_directory(char **dirpath, char *envVarName,
-						char *cmdLineOption, char *description)
+						 char *cmdLineOption, char *description)
 {
 	if (*dirpath == NULL || strlen(*dirpath) == 0)
 	{
@@ -322,8 +322,10 @@ void
 adjust_data_dir(ClusterInfo *cluster)
 {
 	char		filename[MAXPGPATH];
-	char		cmd[MAXPGPATH], cmd_output[MAX_STRING];
-	FILE	   *fp, *output;
+	char		cmd[MAXPGPATH],
+				cmd_output[MAX_STRING];
+	FILE	   *fp,
+			   *output;
 
 	/* If there is no postgresql.conf, it can't be a config-only dir */
 	snprintf(filename, sizeof(filename), "%s/postgresql.conf", cluster->pgconfig);
@@ -345,10 +347,9 @@ adjust_data_dir(ClusterInfo *cluster)
 				CLUSTER_NAME(cluster));
 
 	/*
-	 * We don't have a data directory yet, so we can't check the PG
-	 * version, so this might fail --- only works for PG 9.2+.   If this
-	 * fails, pg_upgrade will fail anyway because the data files will not
-	 * be found.
+	 * We don't have a data directory yet, so we can't check the PG version,
+	 * so this might fail --- only works for PG 9.2+.	If this fails,
+	 * pg_upgrade will fail anyway because the data files will not be found.
 	 */
 	snprintf(cmd, sizeof(cmd), "\"%s/postmaster\" -D \"%s\" -C data_directory",
 			 cluster->bindir, cluster->pgconfig);
@@ -356,7 +357,7 @@ adjust_data_dir(ClusterInfo *cluster)
 	if ((output = popen(cmd, "r")) == NULL ||
 		fgets(cmd_output, sizeof(cmd_output), output) == NULL)
 		pg_log(PG_FATAL, "Could not get data directory using %s: %s\n",
-		cmd, getErrorText(errno));
+			   cmd, getErrorText(errno));
 
 	pclose(output);
 
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index 465ecdd6b3..3537fc2bd0 100644
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -55,7 +55,7 @@ ClusterInfo old_cluster,
 			new_cluster;
 OSInfo		os_info;
 
-char *output_files[] = {
+char	   *output_files[] = {
 	SERVER_LOG_FILE,
 #ifdef WIN32
 	/* unique file for pg_ctl start */
@@ -122,11 +122,10 @@ main(int argc, char **argv)
 	stop_postmaster(false);
 
 	/*
-	 *	Most failures happen in create_new_objects(), which has
-	 *	completed at this point.  We do this here because it is just
-	 *	before linking, which will link the old and new cluster data
-	 *	files, preventing the old cluster from being safely started
-	 *	once the new cluster is started.
+	 * Most failures happen in create_new_objects(), which has completed at
+	 * this point.	We do this here because it is just before linking, which
+	 * will link the old and new cluster data files, preventing the old
+	 * cluster from being safely started once the new cluster is started.
 	 */
 	if (user_opts.transfer_mode == TRANSFER_MODE_LINK)
 		disable_old_cluster();
@@ -215,8 +214,8 @@ prepare_new_cluster(void)
 	exec_prog(true, true, UTILITY_LOG_FILE,
 			  SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" "
 			  "--all --analyze %s >> \"%s\" 2>&1" SYSTEMQUOTE,
-	  new_cluster.bindir, new_cluster.port, os_info.user,
-	  log_opts.verbose ? "--verbose" : "", UTILITY_LOG_FILE);
+			  new_cluster.bindir, new_cluster.port, os_info.user,
+			  log_opts.verbose ? "--verbose" : "", UTILITY_LOG_FILE);
 	check_ok();
 
 	/*
@@ -229,8 +228,8 @@ prepare_new_cluster(void)
 	exec_prog(true, true, UTILITY_LOG_FILE,
 			  SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" "
 			  "--all --freeze %s >> \"%s\" 2>&1" SYSTEMQUOTE,
-	  new_cluster.bindir, new_cluster.port, os_info.user,
-	  log_opts.verbose ? "--verbose" : "", UTILITY_LOG_FILE);
+			  new_cluster.bindir, new_cluster.port, os_info.user,
+			  log_opts.verbose ? "--verbose" : "", UTILITY_LOG_FILE);
 	check_ok();
 
 	get_pg_database_relfilenode(&new_cluster);
@@ -252,8 +251,8 @@ prepare_new_databases(void)
 
 	/*
 	 * Install support functions in the global-object restore database to
-	 * preserve pg_authid.oid.  pg_dumpall uses 'template0' as its template
-	 * database so objects we add into 'template1' are not propogated.  They
+	 * preserve pg_authid.oid.	pg_dumpall uses 'template0' as its template
+	 * database so objects we add into 'template1' are not propogated.	They
 	 * are removed on pg_upgrade exit.
 	 */
 	install_support_functions_in_new_db("template1");
@@ -267,7 +266,7 @@ prepare_new_databases(void)
 	exec_prog(true, true, RESTORE_LOG_FILE,
 			  SYSTEMQUOTE "\"%s/psql\" --echo-queries "
 			  "--set ON_ERROR_STOP=on "
-			  /* --no-psqlrc prevents AUTOCOMMIT=off */
+	/* --no-psqlrc prevents AUTOCOMMIT=off */
 			  "--no-psqlrc --port %d --username \"%s\" "
 			  "-f \"%s\" --dbname template1 >> \"%s\" 2>&1" SYSTEMQUOTE,
 			  new_cluster.bindir, new_cluster.port, os_info.user,
@@ -453,13 +452,13 @@ set_frozenxids(void)
 static void
 cleanup(void)
 {
-	
+
 	fclose(log_opts.internal);
 
 	/* Remove dump and log files? */
 	if (!log_opts.retain)
 	{
-		char		**filename;
+		char	  **filename;
 
 		for (filename = output_files; *filename != NULL; filename++)
 			unlink(*filename);
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 26aa7bb1d2..d12590ac6b 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -75,7 +75,7 @@ extern char *output_files[];
 #define RM_CMD				"rm -f"
 #define RMDIR_CMD			"rm -rf"
 #define SCRIPT_EXT			"sh"
-#define	ECHO_QUOTE	"'"
+#define ECHO_QUOTE	"'"
 #else
 #define pg_copy_file		CopyFile
 #define pg_mv_file			pgrename
@@ -85,7 +85,7 @@ extern char *output_files[];
 #define RMDIR_CMD			"RMDIR /s/q"
 #define SCRIPT_EXT			"bat"
 #define EXE_EXT				".exe"
-#define	ECHO_QUOTE	""
+#define ECHO_QUOTE	""
 #endif
 
 #define CLUSTER_NAME(cluster)	((cluster) == &old_cluster ? "old" : \
@@ -98,7 +98,7 @@ extern char *output_files[];
 /* postmaster/postgres -b (binary_upgrade) flag added during PG 9.1 development */
 #define BINARY_UPGRADE_SERVER_FLAG_CAT_VER 201104251
 /*
- * 	Visibility map changed with this 9.2 commit,
+ *	Visibility map changed with this 9.2 commit,
  *	8f9fe6edce358f7904e0db119416b4d1080a83aa; pick later catalog version.
  */
 #define VISIBILITY_MAP_CRASHSAFE_CAT_VER 201107031
@@ -114,7 +114,7 @@ typedef struct
 	Oid			reloid;			/* relation oid */
 	Oid			relfilenode;	/* relation relfile node */
 	/* relation tablespace path, or "" for the cluster default */
-	char		tablespace[MAXPGPATH];	
+	char		tablespace[MAXPGPATH];
 } RelInfo;
 
 typedef struct
@@ -222,9 +222,11 @@ typedef struct
 	ControlData controldata;	/* pg_control information */
 	DbInfoArr	dbarr;			/* dbinfos array */
 	char	   *pgdata;			/* pathname for cluster's $PGDATA directory */
-	char	   *pgconfig;		/* pathname for cluster's config file directory */
+	char	   *pgconfig;		/* pathname for cluster's config file
+								 * directory */
 	char	   *bindir;			/* pathname for cluster's executable directory */
-	char	   *pgopts;			/* options to pass to the server, like pg_ctl -o */
+	char	   *pgopts;			/* options to pass to the server, like pg_ctl
+								 * -o */
 	unsigned short port;		/* port number where postmaster is waiting */
 	uint32		major_version;	/* PG_VERSION of cluster */
 	char		major_version_str[64];	/* string PG_VERSION of cluster */
@@ -291,8 +293,8 @@ void check_old_cluster(bool live_check,
 void		check_new_cluster(void);
 void		report_clusters_compatible(void);
 void		issue_warnings(char *sequence_script_file_name);
-void		output_completion_banner(char *analyze_script_file_name,
-									 char *deletion_script_file_name);
+void output_completion_banner(char *analyze_script_file_name,
+						 char *deletion_script_file_name);
 void		check_cluster_versions(void);
 void		check_cluster_compatibility(bool live_check);
 void		create_script_for_old_cluster_deletion(char **deletion_script_file_name);
@@ -314,9 +316,10 @@ void		split_old_dump(void);
 
 /* exec.c */
 
-int exec_prog(bool throw_error, bool is_priv,
-	const char *log_file, const char *cmd, ...)
-	__attribute__((format(PG_PRINTF_ATTRIBUTE, 4, 5)));
+int
+exec_prog(bool throw_error, bool is_priv,
+		  const char *log_file, const char *cmd,...)
+__attribute__((format(PG_PRINTF_ATTRIBUTE, 4, 5)));
 void		verify_directories(void);
 bool		is_server_running(const char *datadir);
 
@@ -353,14 +356,14 @@ const char *setupPageConverter(pageCnvCtx **result);
 typedef void *pageCnvCtx;
 #endif
 
-int load_directory(const char *dirname, struct dirent ***namelist);
+int			load_directory(const char *dirname, struct dirent *** namelist);
 const char *copyAndUpdateFile(pageCnvCtx *pageConverter, const char *src,
 				  const char *dst, bool force);
 const char *linkAndUpdateFile(pageCnvCtx *pageConverter, const char *src,
 				  const char *dst);
 
 void		check_hard_link(void);
-FILE 	   *fopen_priv(const char *path, const char *mode);
+FILE	   *fopen_priv(const char *path, const char *mode);
 
 /* function.c */
 
@@ -399,8 +402,9 @@ void		init_tablespaces(void);
 /* server.c */
 
 PGconn	   *connectToServer(ClusterInfo *cluster, const char *db_name);
-PGresult   *executeQueryOrDie(PGconn *conn, const char *fmt, ...)
-	__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
+PGresult *
+executeQueryOrDie(PGconn *conn, const char *fmt,...)
+__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
 
 void		start_postmaster(ClusterInfo *cluster);
 void		stop_postmaster(bool fast);
@@ -413,12 +417,15 @@ void		check_pghost_envvar(void);
 char	   *quote_identifier(const char *s);
 int			get_user_info(char **user_name);
 void		check_ok(void);
-void		report_status(eLogType type, const char *fmt, ...)
-	__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
-void		pg_log(eLogType type, char *fmt, ...)
-	__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
-void		prep_status(const char *fmt, ...)
-	__attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
+void
+report_status(eLogType type, const char *fmt,...)
+__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
+void
+pg_log(eLogType type, char *fmt,...)
+__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
+void
+prep_status(const char *fmt,...)
+__attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
 void		check_ok(void);
 char	   *pg_strdup(const char *s);
 void	   *pg_malloc(int size);
diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c
index 45d6c5415b..3509585de7 100644
--- a/contrib/pg_upgrade/relfilenode.c
+++ b/contrib/pg_upgrade/relfilenode.c
@@ -34,26 +34,28 @@ const char *
 transfer_all_new_dbs(DbInfoArr *old_db_arr,
 				   DbInfoArr *new_db_arr, char *old_pgdata, char *new_pgdata)
 {
-	int			old_dbnum, new_dbnum;
+	int			old_dbnum,
+				new_dbnum;
 	const char *msg = NULL;
 
 	prep_status("%s user relation files\n",
-		user_opts.transfer_mode == TRANSFER_MODE_LINK ? "Linking" : "Copying");
+	  user_opts.transfer_mode == TRANSFER_MODE_LINK ? "Linking" : "Copying");
 
 	/* Scan the old cluster databases and transfer their files */
 	for (old_dbnum = new_dbnum = 0;
 		 old_dbnum < old_db_arr->ndbs;
 		 old_dbnum++, new_dbnum++)
 	{
-		DbInfo	   *old_db = &old_db_arr->dbs[old_dbnum], *new_db = NULL;
+		DbInfo	   *old_db = &old_db_arr->dbs[old_dbnum],
+				   *new_db = NULL;
 		FileNameMap *mappings;
 		int			n_maps;
 		pageCnvCtx *pageConverter = NULL;
 
 		/*
-		 *	Advance past any databases that exist in the new cluster
-		 *	but not in the old, e.g. "postgres".  (The user might
-		 *	have removed the 'postgres' database from the old cluster.)
+		 * Advance past any databases that exist in the new cluster but not in
+		 * the old, e.g. "postgres".  (The user might have removed the
+		 * 'postgres' database from the old cluster.)
 		 */
 		for (; new_dbnum < new_db_arr->ndbs; new_dbnum++)
 		{
@@ -83,8 +85,8 @@ transfer_all_new_dbs(DbInfoArr *old_db_arr,
 		}
 	}
 
-	prep_status(" ");			/* in case nothing printed; pass a space so gcc
-								 * doesn't complain about empty format
+	prep_status(" ");			/* in case nothing printed; pass a space so
+								 * gcc doesn't complain about empty format
 								 * string */
 	check_ok();
 
@@ -137,14 +139,14 @@ transfer_single_new_db(pageCnvCtx *pageConverter,
 	int			mapnum;
 	int			fileno;
 	bool		vm_crashsafe_change = false;
-	
+
 	old_dir[0] = '\0';
 
 	/* Do not copy non-crashsafe vm files for binaries that assume crashsafety */
 	if (old_cluster.controldata.cat_ver < VISIBILITY_MAP_CRASHSAFE_CAT_VER &&
 		new_cluster.controldata.cat_ver >= VISIBILITY_MAP_CRASHSAFE_CAT_VER)
 		vm_crashsafe_change = true;
-	
+
 	for (mapnum = 0; mapnum < size; mapnum++)
 	{
 		char		old_file[MAXPGPATH];
@@ -190,8 +192,8 @@ transfer_single_new_db(pageCnvCtx *pageConverter,
 
 			for (fileno = 0; fileno < numFiles; fileno++)
 			{
-				char *vm_offset = strstr(namelist[fileno]->d_name, "_vm");
-				bool is_vm_file = false;
+				char	   *vm_offset = strstr(namelist[fileno]->d_name, "_vm");
+				bool		is_vm_file = false;
 
 				/* Is a visibility map file? (name ends with _vm) */
 				if (vm_offset && strlen(vm_offset) == strlen("_vm"))
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
index f557453df2..f83d6fa866 100644
--- a/contrib/pg_upgrade/server.c
+++ b/contrib/pg_upgrade/server.c
@@ -161,7 +161,7 @@ start_postmaster(ClusterInfo *cluster)
 	snprintf(cmd, sizeof(cmd),
 			 SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" "
 			 "-o \"-p %d %s %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE,
-			 cluster->bindir, SERVER_LOG_FILE, cluster->pgconfig, cluster->port,
+		  cluster->bindir, SERVER_LOG_FILE, cluster->pgconfig, cluster->port,
 			 (cluster->controldata.cat_ver >=
 			  BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? "-b" :
 			 "-c autovacuum=off -c autovacuum_freeze_max_age=2000000000",
@@ -172,11 +172,11 @@ start_postmaster(ClusterInfo *cluster)
 	 * it might supply a reason for the failure.
 	 */
 	pg_ctl_return = exec_prog(false, true,
-					/* pass both file names if the differ */
-					(strcmp(SERVER_LOG_FILE, SERVER_START_LOG_FILE) == 0) ?
-						SERVER_LOG_FILE :
-						SERVER_LOG_FILE " or " SERVER_START_LOG_FILE,
-					"%s", cmd);
+	/* pass both file names if the differ */
+					  (strcmp(SERVER_LOG_FILE, SERVER_START_LOG_FILE) == 0) ?
+							  SERVER_LOG_FILE :
+							  SERVER_LOG_FILE " or " SERVER_START_LOG_FILE,
+							  "%s", cmd);
 
 	/* Check to see if we can connect to the server; if not, report it. */
 	if ((conn = get_db_conn(cluster, "template1")) == NULL ||
@@ -211,14 +211,14 @@ stop_postmaster(bool fast)
 	else if (os_info.running_cluster == &new_cluster)
 		cluster = &new_cluster;
 	else
-		return;		/* no cluster running */
+		return;					/* no cluster running */
 
 	snprintf(cmd, sizeof(cmd),
 			 SYSTEMQUOTE "\"%s/pg_ctl\" -w -D \"%s\" -o \"%s\" "
 			 "%s stop >> \"%s\" 2>&1" SYSTEMQUOTE,
 			 cluster->bindir, cluster->pgconfig,
 			 cluster->pgopts ? cluster->pgopts : "",
-			fast ? "-m fast" : "", SERVER_STOP_LOG_FILE);
+			 fast ? "-m fast" : "", SERVER_STOP_LOG_FILE);
 
 	exec_prog(fast ? false : true, true, SERVER_STOP_LOG_FILE, "%s", cmd);
 
diff --git a/contrib/pg_upgrade/tablespace.c b/contrib/pg_upgrade/tablespace.c
index 6b61f4bac1..b783b6251e 100644
--- a/contrib/pg_upgrade/tablespace.c
+++ b/contrib/pg_upgrade/tablespace.c
@@ -52,8 +52,8 @@ get_tablespace_paths(void)
 			 "WHERE	spcname != 'pg_default' AND "
 			 "		spcname != 'pg_global'",
 	/* 9.2 removed the spclocation column */
-			(GET_MAJOR_VERSION(old_cluster.major_version) <= 901) ?
-			"spclocation" : "pg_catalog.pg_tablespace_location(oid) AS spclocation");
+			 (GET_MAJOR_VERSION(old_cluster.major_version) <= 901) ?
+	"spclocation" : "pg_catalog.pg_tablespace_location(oid) AS spclocation");
 
 	res = executeQueryOrDie(conn, "%s", query);
 
diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c
index 542425c7c9..b681c0984e 100644
--- a/contrib/pg_upgrade/version_old_8_3.c
+++ b/contrib/pg_upgrade/version_old_8_3.c
@@ -60,10 +60,10 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster)
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-								 /* exclude possible orphaned temp tables */
+		/* exclude possible orphaned temp tables */
 								"  		n.nspname !~ '^pg_temp_' AND "
-								"		n.nspname !~ '^pg_toast_temp_' AND "
-						 		"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
+						 "		n.nspname !~ '^pg_toast_temp_' AND "
+								"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 		ntups = PQntuples(res);
 		i_nspname = PQfnumber(res, "nspname");
@@ -98,9 +98,9 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster)
 		pg_log(PG_REPORT, "fatal\n");
 		pg_log(PG_FATAL,
 			   "Your installation contains the \"name\" data type in user tables.  This\n"
-			   "data type changed its internal alignment between your old and new\n"
+		"data type changed its internal alignment between your old and new\n"
 			   "clusters so this cluster cannot currently be upgraded.  You can remove\n"
-			   "the problem tables and restart the upgrade.  A list of the problem\n"
+		"the problem tables and restart the upgrade.  A list of the problem\n"
 			   "columns is in the file:\n"
 			   "    %s\n\n", output_path);
 	}
@@ -150,10 +150,10 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster)
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-								 /* exclude possible orphaned temp tables */
+		/* exclude possible orphaned temp tables */
 								"  		n.nspname !~ '^pg_temp_' AND "
-								"		n.nspname !~ '^pg_toast_temp_' AND "
-						 		"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
+						 "		n.nspname !~ '^pg_toast_temp_' AND "
+								"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 		ntups = PQntuples(res);
 		i_nspname = PQfnumber(res, "nspname");
@@ -189,7 +189,7 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster)
 		pg_log(PG_FATAL,
 			   "Your installation contains the \"tsquery\" data type.    This data type\n"
 			   "added a new internal field between your old and new clusters so this\n"
-			   "cluster cannot currently be upgraded.  You can remove the problem\n"
+		"cluster cannot currently be upgraded.  You can remove the problem\n"
 			   "columns and restart the upgrade.  A list of the problem columns is in the\n"
 			   "file:\n"
 			   "    %s\n\n", output_path);
@@ -328,10 +328,10 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-								 /* exclude possible orphaned temp tables */
+		/* exclude possible orphaned temp tables */
 								"  		n.nspname !~ '^pg_temp_' AND "
-								"		n.nspname !~ '^pg_toast_temp_' AND "
-						 		"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
+						 "		n.nspname !~ '^pg_toast_temp_' AND "
+								"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 /*
  *	This macro is used below to avoid reindexing indexes already rebuilt
@@ -527,7 +527,7 @@ old_8_3_invalidate_hash_gin_indexes(ClusterInfo *cluster, bool check_mode)
 				   "must be reindexed with the REINDEX command.  The file:\n"
 				   "    %s\n"
 				   "when executed by psql by the database superuser will recreate all invalid\n"
-				   "indexes; until then, none of these indexes will be used.\n\n",
+			  "indexes; until then, none of these indexes will be used.\n\n",
 				   output_path);
 	}
 	else
@@ -648,10 +648,10 @@ old_8_3_invalidate_bpchar_pattern_ops_indexes(ClusterInfo *cluster,
 			pg_log(PG_WARNING, "\n"
 				   "Your installation contains indexes using \"bpchar_pattern_ops\".  These\n"
 				   "indexes have different internal formats between your old and new clusters\n"
-				   "so they must be reindexed with the REINDEX command.  The file:\n"
+			"so they must be reindexed with the REINDEX command.  The file:\n"
 				   "    %s\n"
 				   "when executed by psql by the database superuser will recreate all invalid\n"
-				   "indexes; until then, none of these indexes will be used.\n\n",
+			  "indexes; until then, none of these indexes will be used.\n\n",
 				   output_path);
 	}
 	else
@@ -699,10 +699,10 @@ old_8_3_create_sequence_script(ClusterInfo *cluster)
 								"		pg_catalog.pg_namespace n "
 								"WHERE	c.relkind = 'S' AND "
 								"		c.relnamespace = n.oid AND "
-								 /* exclude possible orphaned temp tables */
+		/* exclude possible orphaned temp tables */
 								"  		n.nspname !~ '^pg_temp_' AND "
-								"		n.nspname !~ '^pg_toast_temp_' AND "
-						 		"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
+						 "		n.nspname !~ '^pg_toast_temp_' AND "
+								"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 		ntups = PQntuples(res);
 		i_nspname = PQfnumber(res, "nspname");
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index b0e699187b..25fb15a847 100644
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -66,7 +66,7 @@
 typedef struct win32_pthread *pthread_t;
 typedef int pthread_attr_t;
 
-static int	pthread_create(pthread_t *thread, pthread_attr_t * attr, void *(*start_routine) (void *), void *arg);
+static int	pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
 static int	pthread_join(pthread_t th, void **thread_return);
 #elif defined(ENABLE_THREAD_SAFETY)
 /* Use platform-dependent pthread capability */
@@ -84,7 +84,7 @@ static int	pthread_join(pthread_t th, void **thread_return);
 typedef struct fork_pthread *pthread_t;
 typedef int pthread_attr_t;
 
-static int	pthread_create(pthread_t *thread, pthread_attr_t * attr, void *(*start_routine) (void *), void *arg);
+static int	pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
 static int	pthread_join(pthread_t th, void **thread_return);
 #endif
 
@@ -198,7 +198,7 @@ typedef struct
 	instr_time	start_time;		/* thread start time */
 	instr_time *exec_elapsed;	/* time spent executing cmds (per Command) */
 	int		   *exec_count;		/* number of cmd executions (per Command) */
-	unsigned short random_state[3]; /* separate randomness for each thread */
+	unsigned short random_state[3];		/* separate randomness for each thread */
 } TState;
 
 #define INVALID_THREAD		((pthread_t) 0)
@@ -1075,7 +1075,7 @@ top:
 
 			/*
 			 * getrand() neeeds to be able to subtract max from min and add
-			 * one the result without overflowing.  Since we know max > min,
+			 * one the result without overflowing.	Since we know max > min,
 			 * we can detect overflow just by checking for a negative result.
 			 * But we must check both that the subtraction doesn't overflow,
 			 * and that adding one to the result doesn't overflow either.
@@ -1267,10 +1267,11 @@ init(void)
 	 * versions.  Since pgbench has never pretended to be fully TPC-B
 	 * compliant anyway, we stick with the historical behavior.
 	 */
-	struct ddlinfo {
-		char *table;
-		char *cols;
-		int declare_fillfactor;
+	struct ddlinfo
+	{
+		char	   *table;
+		char	   *cols;
+		int			declare_fillfactor;
 	};
 	struct ddlinfo DDLs[] = {
 		{
@@ -1321,15 +1322,16 @@ init(void)
 		/* Construct new create table statement. */
 		opts[0] = '\0';
 		if (ddl->declare_fillfactor)
-			snprintf(opts+strlen(opts), 256-strlen(opts),
-				" with (fillfactor=%d)", fillfactor);
+			snprintf(opts + strlen(opts), 256 - strlen(opts),
+					 " with (fillfactor=%d)", fillfactor);
 		if (tablespace != NULL)
 		{
-			char *escape_tablespace;
+			char	   *escape_tablespace;
+
 			escape_tablespace = PQescapeIdentifier(con, tablespace,
 												   strlen(tablespace));
-			snprintf(opts+strlen(opts), 256-strlen(opts),
-				" tablespace %s", escape_tablespace);
+			snprintf(opts + strlen(opts), 256 - strlen(opts),
+					 " tablespace %s", escape_tablespace);
 			PQfreemem(escape_tablespace);
 		}
 		snprintf(buffer, 256, "create%s table %s(%s)%s",
@@ -1404,17 +1406,18 @@ init(void)
 	fprintf(stderr, "set primary key...\n");
 	for (i = 0; i < lengthof(DDLAFTERs); i++)
 	{
-		char	buffer[256];
+		char		buffer[256];
 
 		strncpy(buffer, DDLAFTERs[i], 256);
 
 		if (index_tablespace != NULL)
 		{
-			char *escape_tablespace;
+			char	   *escape_tablespace;
+
 			escape_tablespace = PQescapeIdentifier(con, index_tablespace,
 												   strlen(index_tablespace));
-			snprintf(buffer+strlen(buffer), 256-strlen(buffer),
-				" using index tablespace %s", escape_tablespace);
+			snprintf(buffer + strlen(buffer), 256 - strlen(buffer),
+					 " using index tablespace %s", escape_tablespace);
 			PQfreemem(escape_tablespace);
 		}
 
@@ -1861,10 +1864,10 @@ main(int argc, char **argv)
 	int			i;
 
 	static struct option long_options[] = {
-			{"index-tablespace", required_argument, NULL, 3},
-			{"tablespace", required_argument, NULL, 2},
-			{"unlogged-tables", no_argument, &unlogged_tables, 1},
-			{NULL, 0, NULL, 0}
+		{"index-tablespace", required_argument, NULL, 3},
+		{"tablespace", required_argument, NULL, 2},
+		{"unlogged-tables", no_argument, &unlogged_tables, 1},
+		{NULL, 0, NULL, 0}
 	};
 
 #ifdef HAVE_GETRLIMIT
@@ -2065,10 +2068,10 @@ main(int argc, char **argv)
 			case 0:
 				/* This covers long options which take no argument. */
 				break;
-			case 2:							/* tablespace */
+			case 2:				/* tablespace */
 				tablespace = optarg;
 				break;
-			case 3:							/* index-tablespace */
+			case 3:				/* index-tablespace */
 				index_tablespace = optarg;
 				break;
 			default:
@@ -2571,7 +2574,7 @@ typedef struct fork_pthread
 
 static int
 pthread_create(pthread_t *thread,
-			   pthread_attr_t * attr,
+			   pthread_attr_t *attr,
 			   void *(*start_routine) (void *),
 			   void *arg)
 {
@@ -2687,7 +2690,7 @@ win32_pthread_run(void *arg)
 
 static int
 pthread_create(pthread_t *thread,
-			   pthread_attr_t * attr,
+			   pthread_attr_t *attr,
 			   void *(*start_routine) (void *),
 			   void *arg)
 {
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
index 6c7a2b329e..2a5cd70208 100644
--- a/contrib/pgcrypto/crypt-md5.c
+++ b/contrib/pgcrypto/crypt-md5.c
@@ -34,8 +34,8 @@ char *
 px_crypt_md5(const char *pw, const char *salt, char *passwd, unsigned dstlen)
 {
 	static char *magic = "$1$"; /* This string is magic for this algorithm.
-								 * Having it this way, we can get better
-								 * later on */
+								 * Having it this way, we can get better later
+								 * on */
 	static char *p;
 	static const char *sp,
 			   *ep;
diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
index 610b7fad78..80e8624460 100644
--- a/contrib/pgcrypto/px.h
+++ b/contrib/pgcrypto/px.h
@@ -204,8 +204,9 @@ const char *px_resolve_alias(const PX_Alias *aliases, const char *name);
 void		px_set_debug_handler(void (*handler) (const char *));
 
 #ifdef PX_DEBUG
-void		px_debug(const char *fmt, ...)
-	__attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
+void
+px_debug(const char *fmt,...)
+__attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
 #else
 #define px_debug(...)
 #endif
diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c
index 9f2ec1f210..d4fc8a0fd6 100644
--- a/contrib/pgstattuple/pgstatindex.c
+++ b/contrib/pgstattuple/pgstatindex.c
@@ -95,7 +95,7 @@ pgstatindex(PG_FUNCTION_ARGS)
 	BlockNumber nblocks;
 	BlockNumber blkno;
 	BTIndexStat indexStat;
- 	BufferAccessStrategy bstrategy = GetAccessStrategy(BAS_BULKREAD);
+	BufferAccessStrategy bstrategy = GetAccessStrategy(BAS_BULKREAD);
 
 	if (!superuser())
 		ereport(ERROR,
@@ -160,7 +160,7 @@ pgstatindex(PG_FUNCTION_ARGS)
 		CHECK_FOR_INTERRUPTS();
 
 		/* Read and lock buffer */
- 		buffer = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL, bstrategy);
+		buffer = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL, bstrategy);
 		LockBuffer(buffer, BUFFER_LOCK_SHARE);
 
 		page = BufferGetPage(buffer);
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index c9be8c92e4..2b62b78506 100644
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -62,7 +62,7 @@ typedef struct pgstattuple_type
 } pgstattuple_type;
 
 typedef void (*pgstat_page) (pgstattuple_type *, Relation, BlockNumber,
-							 BufferAccessStrategy);
+										 BufferAccessStrategy);
 
 static Datum build_pgstattuple_type(pgstattuple_type *stat,
 					   FunctionCallInfo fcinfo);
diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c
index 0c395c42a3..5a4246752a 100644
--- a/contrib/sepgsql/database.c
+++ b/contrib/sepgsql/database.c
@@ -32,19 +32,19 @@ void
 sepgsql_database_post_create(Oid databaseId, const char *dtemplate)
 {
 	Relation	rel;
-	ScanKeyData	skey;
-	SysScanDesc	sscan;
+	ScanKeyData skey;
+	SysScanDesc sscan;
 	HeapTuple	tuple;
 	char	   *tcontext;
 	char	   *ncontext;
 	char		audit_name[NAMEDATALEN + 20];
-	ObjectAddress		object;
-	Form_pg_database	datForm;
+	ObjectAddress object;
+	Form_pg_database datForm;
 
 	/*
-	 * Oid of the source database is not saved in pg_database catalog,
-	 * so we collect its identifier using contextual information.
-	 * If NULL, its default is "template1" according to createdb().
+	 * Oid of the source database is not saved in pg_database catalog, so we
+	 * collect its identifier using contextual information. If NULL, its
+	 * default is "template1" according to createdb().
 	 */
 	if (!dtemplate)
 		dtemplate = "template1";
@@ -56,6 +56,7 @@ sepgsql_database_post_create(Oid databaseId, const char *dtemplate)
 	tcontext = sepgsql_get_label(object.classId,
 								 object.objectId,
 								 object.objectSubId);
+
 	/*
 	 * check db_database:{getattr} permission
 	 */
@@ -67,11 +68,11 @@ sepgsql_database_post_create(Oid databaseId, const char *dtemplate)
 								  true);
 
 	/*
-	 * Compute a default security label of the newly created database
-	 * based on a pair of security label of client and source database.
+	 * Compute a default security label of the newly created database based on
+	 * a pair of security label of client and source database.
 	 *
-	 * XXX - uncoming version of libselinux supports to take object
-	 * name to handle special treatment on default security label.
+	 * XXX - uncoming version of libselinux supports to take object name to
+	 * handle special treatment on default security label.
 	 */
 	rel = heap_open(DatabaseRelationId, AccessShareLock);
 
@@ -91,6 +92,7 @@ sepgsql_database_post_create(Oid databaseId, const char *dtemplate)
 	ncontext = sepgsql_compute_create(sepgsql_get_client_label(),
 									  tcontext,
 									  SEPG_CLASS_DB_DATABASE);
+
 	/*
 	 * check db_database:{create} permission
 	 */
@@ -126,8 +128,8 @@ sepgsql_database_post_create(Oid databaseId, const char *dtemplate)
 void
 sepgsql_database_drop(Oid databaseId)
 {
-	ObjectAddress	object;
-	char		   *audit_name;
+	ObjectAddress object;
+	char	   *audit_name;
 
 	/*
 	 * check db_database:{drop} permission
@@ -153,8 +155,8 @@ sepgsql_database_drop(Oid databaseId)
 void
 sepgsql_database_relabel(Oid databaseId, const char *seclabel)
 {
-	ObjectAddress	object;
-	char		   *audit_name;
+	ObjectAddress object;
+	char	   *audit_name;
 
 	object.classId = DatabaseRelationId;
 	object.objectId = databaseId;
@@ -170,6 +172,7 @@ sepgsql_database_relabel(Oid databaseId, const char *seclabel)
 							SEPG_DB_DATABASE__RELABELFROM,
 							audit_name,
 							true);
+
 	/*
 	 * check db_database:{relabelto} permission
 	 */
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index 17aa41cf4e..47a1087417 100644
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -150,7 +150,7 @@ check_relation_privileges(Oid relOid,
 						  uint32 required,
 						  bool abort)
 {
-	ObjectAddress	object;
+	ObjectAddress object;
 	char	   *audit_name;
 	Bitmapset  *columns;
 	int			index;
diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c
index ffa078677c..914519109c 100644
--- a/contrib/sepgsql/hooks.c
+++ b/contrib/sepgsql/hooks.c
@@ -52,9 +52,9 @@ typedef struct
 	 * command. Elsewhere (including the case of default) NULL.
 	 */
 	const char *createdb_dtemplate;
-} sepgsql_context_info_t;
+}	sepgsql_context_info_t;
 
-static sepgsql_context_info_t	sepgsql_context_info;
+static sepgsql_context_info_t sepgsql_context_info;
 
 /*
  * GUC: sepgsql.permissive = (on|off)
@@ -101,7 +101,7 @@ sepgsql_object_access(ObjectAccessType access,
 			{
 				case DatabaseRelationId:
 					sepgsql_database_post_create(objectId,
-								sepgsql_context_info.createdb_dtemplate);
+									sepgsql_context_info.createdb_dtemplate);
 					break;
 
 				case NamespaceRelationId:
@@ -115,9 +115,8 @@ sepgsql_object_access(ObjectAccessType access,
 						 * All cases we want to apply permission checks on
 						 * creation of a new relation are invocation of the
 						 * heap_create_with_catalog via DefineRelation or
-						 * OpenIntoRel.
-						 * Elsewhere, we need neither assignment of security
-						 * label nor permission checks.
+						 * OpenIntoRel. Elsewhere, we need neither assignment
+						 * of security label nor permission checks.
 						 */
 						switch (sepgsql_context_info.cmdtype)
 						{
@@ -150,12 +149,12 @@ sepgsql_object_access(ObjectAccessType access,
 
 		case OAT_DROP:
 			{
-				ObjectAccessDrop *drop_arg = (ObjectAccessDrop *)arg;
+				ObjectAccessDrop *drop_arg = (ObjectAccessDrop *) arg;
 
 				/*
-				 * No need to apply permission checks on object deletion
-				 * due to internal cleanups; such as removal of temporary
-				 * database object on session closed.
+				 * No need to apply permission checks on object deletion due
+				 * to internal cleanups; such as removal of temporary database
+				 * object on session closed.
 				 */
 				if ((drop_arg->dropflags & PERFORM_DELETION_INTERNAL) != 0)
 					break;
@@ -219,13 +218,13 @@ sepgsql_exec_check_perms(List *rangeTabls, bool abort)
 /*
  * sepgsql_executor_start
  *
- * It saves contextual information during ExecutorStart to distinguish 
+ * It saves contextual information during ExecutorStart to distinguish
  * a case with/without permission checks later.
  */
 static void
 sepgsql_executor_start(QueryDesc *queryDesc, int eflags)
 {
-	sepgsql_context_info_t	saved_context_info = sepgsql_context_info;
+	sepgsql_context_info_t saved_context_info = sepgsql_context_info;
 
 	PG_TRY();
 	{
@@ -270,28 +269,29 @@ sepgsql_utility_command(Node *parsetree,
 						DestReceiver *dest,
 						char *completionTag)
 {
-	sepgsql_context_info_t	saved_context_info = sepgsql_context_info;
-	ListCell	   *cell;
+	sepgsql_context_info_t saved_context_info = sepgsql_context_info;
+	ListCell   *cell;
 
 	PG_TRY();
 	{
 		/*
 		 * Check command tag to avoid nefarious operations, and save the
-		 * current contextual information to determine whether we should
-		 * apply permission checks here, or not.
+		 * current contextual information to determine whether we should apply
+		 * permission checks here, or not.
 		 */
 		sepgsql_context_info.cmdtype = nodeTag(parsetree);
 
 		switch (nodeTag(parsetree))
 		{
 			case T_CreatedbStmt:
+
 				/*
 				 * We hope to reference name of the source database, but it
 				 * does not appear in system catalog. So, we save it here.
 				 */
-				foreach (cell, ((CreatedbStmt *) parsetree)->options)
+				foreach(cell, ((CreatedbStmt *) parsetree)->options)
 				{
-					DefElem	   *defel = (DefElem *) lfirst(cell);
+					DefElem    *defel = (DefElem *) lfirst(cell);
 
 					if (strcmp(defel->defname, "template") == 0)
 					{
@@ -303,6 +303,7 @@ sepgsql_utility_command(Node *parsetree,
 				break;
 
 			case T_LoadStmt:
+
 				/*
 				 * We reject LOAD command across the board on enforcing mode,
 				 * because a binary module can arbitrarily override hooks.
@@ -315,6 +316,7 @@ sepgsql_utility_command(Node *parsetree,
 				}
 				break;
 			default:
+
 				/*
 				 * Right now we don't check any other utility commands,
 				 * because it needs more detailed information to make access
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index 85f4efe072..23577b5844 100644
--- a/contrib/sepgsql/label.c
+++ b/contrib/sepgsql/label.c
@@ -58,17 +58,18 @@ static fmgr_hook_type next_fmgr_hook = NULL;
  * we use the list client_label_pending of pending_label to keep track of which
  * labels were set during the (sub-)transactions.
  */
-static char *client_label_peer		= NULL;	/* set by getpeercon(3) */
-static List *client_label_pending	= NIL;	/* pending list being set by
-											 * sepgsql_setcon() */
-static char *client_label_committed	= NULL;	/* set by sepgsql_setcon(),
-											 * and already committed */
-static char *client_label_func		= NULL;	/* set by trusted procedure */
-
-typedef struct {
-	SubTransactionId	subid;
-	char			   *label;
-} pending_label;
+static char *client_label_peer = NULL;	/* set by getpeercon(3) */
+static List *client_label_pending = NIL;		/* pending list being set by
+												 * sepgsql_setcon() */
+static char *client_label_committed = NULL;		/* set by sepgsql_setcon(),
+												 * and already committed */
+static char *client_label_func = NULL;	/* set by trusted procedure */
+
+typedef struct
+{
+	SubTransactionId subid;
+	char	   *label;
+}	pending_label;
 
 /*
  * sepgsql_get_client_label
@@ -87,7 +88,7 @@ sepgsql_get_client_label(void)
 	/* uncommitted sepgsql_setcon() value */
 	if (client_label_pending)
 	{
-		pending_label  *plabel = llast(client_label_pending);
+		pending_label *plabel = llast(client_label_pending);
 
 		if (plabel->label)
 			return plabel->label;
@@ -104,16 +105,16 @@ sepgsql_get_client_label(void)
  * sepgsql_set_client_label
  *
  * This routine tries to switch the current security label of the client, and
- * checks related permissions.  The supplied new label shall be added to the
+ * checks related permissions.	The supplied new label shall be added to the
  * client_label_pending list, then saved at transaction-commit time to ensure
  * transaction-awareness.
  */
 static void
 sepgsql_set_client_label(const char *new_label)
 {
-	const char	   *tcontext;
-	MemoryContext	oldcxt;
-	pending_label  *plabel;
+	const char *tcontext;
+	MemoryContext oldcxt;
+	pending_label *plabel;
 
 	/* Reset to the initial client label, if NULL */
 	if (!new_label)
@@ -140,9 +141,10 @@ sepgsql_set_client_label(const char *new_label)
 								  SEPG_PROCESS__DYNTRANSITION,
 								  NULL,
 								  true);
+
 	/*
-	 * Append the supplied new_label on the pending list until
-	 * the current transaction is committed.
+	 * Append the supplied new_label on the pending list until the current
+	 * transaction is committed.
 	 */
 	oldcxt = MemoryContextSwitchTo(CurTransactionContext);
 
@@ -158,7 +160,7 @@ sepgsql_set_client_label(const char *new_label)
 /*
  * sepgsql_xact_callback
  *
- * A callback routine of transaction commit/abort/prepare.  Commmit or abort
+ * A callback routine of transaction commit/abort/prepare.	Commmit or abort
  * changes in the client_label_pending list.
  */
 static void
@@ -168,8 +170,8 @@ sepgsql_xact_callback(XactEvent event, void *arg)
 	{
 		if (client_label_pending != NIL)
 		{
-			pending_label  *plabel = llast(client_label_pending);
-			char		   *new_label;
+			pending_label *plabel = llast(client_label_pending);
+			char	   *new_label;
 
 			if (plabel->label)
 				new_label = MemoryContextStrdup(TopMemoryContext,
@@ -181,10 +183,11 @@ sepgsql_xact_callback(XactEvent event, void *arg)
 				pfree(client_label_committed);
 
 			client_label_committed = new_label;
+
 			/*
-			 * XXX - Note that items of client_label_pending are allocated
-			 * on CurTransactionContext, thus, all acquired memory region
-			 * shall be released implicitly.
+			 * XXX - Note that items of client_label_pending are allocated on
+			 * CurTransactionContext, thus, all acquired memory region shall
+			 * be released implicitly.
 			 */
 			client_label_pending = NIL;
 		}
@@ -212,7 +215,8 @@ sepgsql_subxact_callback(SubXactEvent event, SubTransactionId mySubid,
 		prev = NULL;
 		for (cell = list_head(client_label_pending); cell; cell = next)
 		{
-			pending_label  *plabel = lfirst(cell);
+			pending_label *plabel = lfirst(cell);
+
 			next = lnext(cell);
 
 			if (plabel->subid == mySubid)
@@ -272,7 +276,7 @@ sepgsql_client_auth(Port *port, int status)
 static bool
 sepgsql_needs_fmgr_hook(Oid functionId)
 {
-	ObjectAddress	object;
+	ObjectAddress object;
 
 	if (next_needs_fmgr_hook &&
 		(*next_needs_fmgr_hook) (functionId))
@@ -340,8 +344,8 @@ sepgsql_fmgr_hook(FmgrHookEventType event,
 
 				/*
 				 * process:transition permission between old and new label,
-				 * when user tries to switch security label of the client
-				 * on execution of trusted procedure.
+				 * when user tries to switch security label of the client on
+				 * execution of trusted procedure.
 				 */
 				if (stack->new_label)
 					sepgsql_avc_check_perms_label(stack->new_label,
diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c
index 1efbc906c6..b68314d878 100644
--- a/contrib/sepgsql/proc.c
+++ b/contrib/sepgsql/proc.c
@@ -42,9 +42,9 @@ sepgsql_proc_post_create(Oid functionId)
 	char	   *tcontext;
 	char	   *ncontext;
 	int			i;
-	StringInfoData	audit_name;
-	ObjectAddress	object;
-	Form_pg_proc	proForm;
+	StringInfoData audit_name;
+	ObjectAddress object;
+	Form_pg_proc proForm;
 
 	/*
 	 * Fetch namespace of the new procedure. Because pg_proc entry is not
@@ -77,6 +77,7 @@ sepgsql_proc_post_create(Oid functionId)
 							SEPG_DB_SCHEMA__ADD_NAME,
 							getObjectDescription(&object),
 							true);
+
 	/*
 	 * XXX - db_language:{implement} also should be checked here
 	 */
@@ -97,9 +98,10 @@ sepgsql_proc_post_create(Oid functionId)
 	 */
 	initStringInfo(&audit_name);
 	appendStringInfo(&audit_name, "function %s(", NameStr(proForm->proname));
-	for (i=0; i < proForm->pronargs; i++)
+	for (i = 0; i < proForm->pronargs; i++)
 	{
-		Oid		typeoid = proForm->proargtypes.values[i];
+		Oid			typeoid = proForm->proargtypes.values[i];
+
 		if (i > 0)
 			appendStringInfoChar(&audit_name, ',');
 		appendStringInfoString(&audit_name, format_type_be(typeoid));
@@ -111,6 +113,7 @@ sepgsql_proc_post_create(Oid functionId)
 								  SEPG_DB_PROCEDURE__CREATE,
 								  audit_name.data,
 								  true);
+
 	/*
 	 * Assign the default security label on a new procedure
 	 */
@@ -138,8 +141,8 @@ sepgsql_proc_post_create(Oid functionId)
 void
 sepgsql_proc_drop(Oid functionId)
 {
-	ObjectAddress	object;
-	char		   *audit_name;
+	ObjectAddress object;
+	char	   *audit_name;
 
 	/*
 	 * check db_schema:{remove_name} permission
@@ -156,19 +159,19 @@ sepgsql_proc_drop(Oid functionId)
 							true);
 	pfree(audit_name);
 
-    /*
-     * check db_procedure:{drop} permission
-     */
+	/*
+	 * check db_procedure:{drop} permission
+	 */
 	object.classId = ProcedureRelationId;
 	object.objectId = functionId;
 	object.objectSubId = 0;
 	audit_name = getObjectDescription(&object);
 
-    sepgsql_avc_check_perms(&object,
-                            SEPG_CLASS_DB_PROCEDURE,
-                            SEPG_DB_PROCEDURE__DROP,
-                            audit_name,
-                            true);
+	sepgsql_avc_check_perms(&object,
+							SEPG_CLASS_DB_PROCEDURE,
+							SEPG_DB_PROCEDURE__DROP,
+							audit_name,
+							true);
 	pfree(audit_name);
 }
 
@@ -181,8 +184,8 @@ sepgsql_proc_drop(Oid functionId)
 void
 sepgsql_proc_relabel(Oid functionId, const char *seclabel)
 {
-	ObjectAddress	object;
-	char		   *audit_name;
+	ObjectAddress object;
+	char	   *audit_name;
 
 	object.classId = ProcedureRelationId;
 	object.objectId = functionId;
@@ -198,6 +201,7 @@ sepgsql_proc_relabel(Oid functionId, const char *seclabel)
 							SEPG_DB_PROCEDURE__RELABELFROM,
 							audit_name,
 							true);
+
 	/*
 	 * check db_procedure:{relabelto} permission
 	 */
diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c
index 259be49268..e759a7d98e 100644
--- a/contrib/sepgsql/relation.c
+++ b/contrib/sepgsql/relation.c
@@ -44,9 +44,9 @@ sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum)
 	char	   *scontext;
 	char	   *tcontext;
 	char	   *ncontext;
-	char		audit_name[2*NAMEDATALEN + 20];
+	char		audit_name[2 * NAMEDATALEN + 20];
 	ObjectAddress object;
-	Form_pg_attribute	attForm;
+	Form_pg_attribute attForm;
 
 	/*
 	 * Only attributes within regular relation have individual security
@@ -84,6 +84,7 @@ sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum)
 	tcontext = sepgsql_get_label(RelationRelationId, relOid, 0);
 	ncontext = sepgsql_compute_create(scontext, tcontext,
 									  SEPG_CLASS_DB_COLUMN);
+
 	/*
 	 * check db_column:{create} permission
 	 */
@@ -118,8 +119,8 @@ sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum)
 void
 sepgsql_attribute_drop(Oid relOid, AttrNumber attnum)
 {
-	ObjectAddress	object;
-	char		   *audit_name;
+	ObjectAddress object;
+	char	   *audit_name;
 
 	if (get_rel_relkind(relOid) != RELKIND_RELATION)
 		return;
@@ -151,7 +152,7 @@ sepgsql_attribute_relabel(Oid relOid, AttrNumber attnum,
 						  const char *seclabel)
 {
 	ObjectAddress object;
-	char		 *audit_name;
+	char	   *audit_name;
 
 	if (get_rel_relkind(relOid) != RELKIND_RELATION)
 		ereport(ERROR,
@@ -172,6 +173,7 @@ sepgsql_attribute_relabel(Oid relOid, AttrNumber attnum,
 							SEPG_DB_COLUMN__RELABELFROM,
 							audit_name,
 							true);
+
 	/*
 	 * check db_column:{relabelto} permission
 	 */
@@ -203,7 +205,7 @@ sepgsql_relation_post_create(Oid relOid)
 	char	   *tcontext;		/* schema */
 	char	   *rcontext;		/* relation */
 	char	   *ccontext;		/* column */
-	char		audit_name[2*NAMEDATALEN + 20];
+	char		audit_name[2 * NAMEDATALEN + 20];
 
 	/*
 	 * Fetch catalog record of the new relation. Because pg_class entry is not
@@ -254,6 +256,7 @@ sepgsql_relation_post_create(Oid relOid)
 							SEPG_DB_SCHEMA__ADD_NAME,
 							getObjectDescription(&object),
 							true);
+
 	/*
 	 * Compute a default security label when we create a new relation object
 	 * under the specified namespace.
@@ -273,6 +276,7 @@ sepgsql_relation_post_create(Oid relOid)
 								  SEPG_DB_DATABASE__CREATE,
 								  audit_name,
 								  true);
+
 	/*
 	 * Assign the default security label on the new relation
 	 */
@@ -288,10 +292,10 @@ sepgsql_relation_post_create(Oid relOid)
 	if (classForm->relkind == RELKIND_RELATION)
 	{
 		Relation	arel;
-		ScanKeyData	akey;
-		SysScanDesc	ascan;
+		ScanKeyData akey;
+		SysScanDesc ascan;
 		HeapTuple	atup;
-		Form_pg_attribute	attForm;
+		Form_pg_attribute attForm;
 
 		arel = heap_open(AttributeRelationId, AccessShareLock);
 
@@ -315,6 +319,7 @@ sepgsql_relation_post_create(Oid relOid)
 			ccontext = sepgsql_compute_create(scontext,
 											  rcontext,
 											  SEPG_CLASS_DB_COLUMN);
+
 			/*
 			 * check db_column:{create} permission
 			 */
@@ -348,10 +353,10 @@ out:
 void
 sepgsql_relation_drop(Oid relOid)
 {
-	ObjectAddress	object;
-	char		   *audit_name;
-	uint16_t		tclass = 0;
-	char			relkind;
+	ObjectAddress object;
+	char	   *audit_name;
+	uint16_t	tclass = 0;
+	char		relkind;
 
 	relkind = get_rel_relkind(relOid);
 	if (relkind == RELKIND_RELATION)
@@ -398,13 +403,13 @@ sepgsql_relation_drop(Oid relOid)
 	 */
 	if (relkind == RELKIND_RELATION)
 	{
-		Form_pg_attribute	attForm;
+		Form_pg_attribute attForm;
 		CatCList   *attrList;
 		HeapTuple	atttup;
 		int			i;
 
 		attrList = SearchSysCacheList1(ATTNUM, ObjectIdGetDatum(relOid));
-		for (i=0; i < attrList->n_members; i++)
+		for (i = 0; i < attrList->n_members; i++)
 		{
 			atttup = &attrList->members[i]->tuple;
 			attForm = (Form_pg_attribute) GETSTRUCT(atttup);
@@ -436,7 +441,7 @@ sepgsql_relation_drop(Oid relOid)
 void
 sepgsql_relation_relabel(Oid relOid, const char *seclabel)
 {
-	ObjectAddress	object;
+	ObjectAddress object;
 	char	   *audit_name;
 	char		relkind;
 	uint16_t	tclass = 0;
@@ -468,6 +473,7 @@ sepgsql_relation_relabel(Oid relOid, const char *seclabel)
 							SEPG_DB_TABLE__RELABELFROM,
 							audit_name,
 							true);
+
 	/*
 	 * check db_xxx:{relabelto} permission
 	 */
diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c
index 31d60efe18..230449dc4b 100644
--- a/contrib/sepgsql/schema.c
+++ b/contrib/sepgsql/schema.c
@@ -35,22 +35,22 @@ void
 sepgsql_schema_post_create(Oid namespaceId)
 {
 	Relation	rel;
-	ScanKeyData	skey;
-	SysScanDesc	sscan;
+	ScanKeyData skey;
+	SysScanDesc sscan;
 	HeapTuple	tuple;
 	char	   *tcontext;
 	char	   *ncontext;
 	char		audit_name[NAMEDATALEN + 20];
-	ObjectAddress		object;
-	Form_pg_namespace	nspForm;
+	ObjectAddress object;
+	Form_pg_namespace nspForm;
 
 	/*
 	 * Compute a default security label when we create a new schema object
 	 * under the working database.
 	 *
-	 * XXX - uncoming version of libselinux supports to take object
-	 * name to handle special treatment on default security label;
-	 * such as special label on "pg_temp" schema.
+	 * XXX - uncoming version of libselinux supports to take object name to
+	 * handle special treatment on default security label; such as special
+	 * label on "pg_temp" schema.
 	 */
 	rel = heap_open(NamespaceRelationId, AccessShareLock);
 
@@ -71,6 +71,7 @@ sepgsql_schema_post_create(Oid namespaceId)
 	ncontext = sepgsql_compute_create(sepgsql_get_client_label(),
 									  tcontext,
 									  SEPG_CLASS_DB_SCHEMA);
+
 	/*
 	 * check db_schema:{create}
 	 */
@@ -104,8 +105,8 @@ sepgsql_schema_post_create(Oid namespaceId)
 void
 sepgsql_schema_drop(Oid namespaceId)
 {
-	ObjectAddress	object;
-	char		   *audit_name;
+	ObjectAddress object;
+	char	   *audit_name;
 
 	/*
 	 * check db_schema:{drop} permission
@@ -116,7 +117,7 @@ sepgsql_schema_drop(Oid namespaceId)
 	audit_name = getObjectDescription(&object);
 
 	sepgsql_avc_check_perms(&object,
-                            SEPG_CLASS_DB_SCHEMA,
+							SEPG_CLASS_DB_SCHEMA,
 							SEPG_DB_SCHEMA__DROP,
 							audit_name,
 							true);
@@ -132,8 +133,8 @@ sepgsql_schema_drop(Oid namespaceId)
 void
 sepgsql_schema_relabel(Oid namespaceId, const char *seclabel)
 {
-	ObjectAddress	object;
-	char		   *audit_name;
+	ObjectAddress object;
+	char	   *audit_name;
 
 	object.classId = NamespaceRelationId;
 	object.objectId = namespaceId;
@@ -149,6 +150,7 @@ sepgsql_schema_relabel(Oid namespaceId, const char *seclabel)
 							SEPG_DB_SCHEMA__RELABELFROM,
 							audit_name,
 							true);
+
 	/*
 	 * check db_schema:{relabelto} permission
 	 */
diff --git a/contrib/sepgsql/sepgsql.h b/contrib/sepgsql/sepgsql.h
index 708d4ee656..479b136909 100644
--- a/contrib/sepgsql/sepgsql.h
+++ b/contrib/sepgsql/sepgsql.h
@@ -248,20 +248,21 @@ extern bool sepgsql_check_perms(const char *scontext,
 					uint32 required,
 					const char *audit_name,
 					bool abort);
+
 /*
  * uavc.c
  */
 #define SEPGSQL_AVC_NOAUDIT			((void *)(-1))
 extern bool sepgsql_avc_check_perms_label(const char *tcontext,
-										  uint16 tclass,
-										  uint32 required,
-										  const char *audit_name,
-										  bool abort);
+							  uint16 tclass,
+							  uint32 required,
+							  const char *audit_name,
+							  bool abort);
 extern bool sepgsql_avc_check_perms(const ObjectAddress *tobject,
-									uint16 tclass,
-									uint32 required,
-									const char *audit_name,
-									bool abort);
+						uint16 tclass,
+						uint32 required,
+						const char *audit_name,
+						bool abort);
 extern char *sepgsql_avc_trusted_proc(Oid functionId);
 extern void sepgsql_avc_init(void);
 
@@ -269,7 +270,7 @@ extern void sepgsql_avc_init(void);
  * label.c
  */
 extern char *sepgsql_get_client_label(void);
-extern void  sepgsql_init_client_label(void);
+extern void sepgsql_init_client_label(void);
 extern char *sepgsql_get_label(Oid relOid, Oid objOid, int32 subId);
 
 extern void sepgsql_object_relabel(const ObjectAddress *object,
@@ -290,7 +291,7 @@ extern bool sepgsql_dml_privileges(List *rangeTabls, bool abort);
  * database.c
  */
 extern void sepgsql_database_post_create(Oid databaseId,
-										 const char *dtemplate);
+							 const char *dtemplate);
 extern void sepgsql_database_drop(Oid databaseId);
 extern void sepgsql_database_relabel(Oid databaseId, const char *seclabel);
 
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
index 905f87dfc8..9641a17d79 100644
--- a/contrib/sepgsql/uavc.c
+++ b/contrib/sepgsql/uavc.c
@@ -30,22 +30,22 @@
  */
 typedef struct
 {
-	uint32		hash;		/* hash value of this cache entry */
-	char	   *scontext;	/* security context of the subject */
-	char	   *tcontext;	/* security context of the target */
-	uint16		tclass;		/* object class of the target */
+	uint32		hash;			/* hash value of this cache entry */
+	char	   *scontext;		/* security context of the subject */
+	char	   *tcontext;		/* security context of the target */
+	uint16		tclass;			/* object class of the target */
 
-	uint32		allowed;	/* permissions to be allowed */
-	uint32		auditallow;	/* permissions to be audited on allowed */
-	uint32		auditdeny;	/* permissions to be audited on denied */
+	uint32		allowed;		/* permissions to be allowed */
+	uint32		auditallow;		/* permissions to be audited on allowed */
+	uint32		auditdeny;		/* permissions to be audited on denied */
 
-	bool		permissive;	/* true, if permissive rule */
-	bool		hot_cache;	/* true, if recently referenced */
+	bool		permissive;		/* true, if permissive rule */
+	bool		hot_cache;		/* true, if recently referenced */
 	bool		tcontext_is_valid;
-							/* true, if tcontext is valid */
-	char	   *ncontext;	/* temporary scontext on execution of trusted
-							 * procedure, or NULL elsewhere */
-} avc_cache;
+	/* true, if tcontext is valid */
+	char	   *ncontext;		/* temporary scontext on execution of trusted
+								 * procedure, or NULL elsewhere */
+}	avc_cache;
 
 /*
  * Declaration of static variables
@@ -54,12 +54,12 @@ typedef struct
 #define AVC_NUM_RECLAIM		16
 #define AVC_DEF_THRESHOLD	384
 
-static MemoryContext	avc_mem_cxt;
-static List	   *avc_slots[AVC_NUM_SLOTS];	/* avc's hash buckets */
-static int		avc_num_caches;	/* number of caches currently used */
-static int		avc_lru_hint;	/* index of the buckets to be reclaimed next */
-static int		avc_threshold;	/* threshold to launch cache-reclaiming  */
-static char	   *avc_unlabeled;	/* system 'unlabeled' label */
+static MemoryContext avc_mem_cxt;
+static List *avc_slots[AVC_NUM_SLOTS];	/* avc's hash buckets */
+static int	avc_num_caches;		/* number of caches currently used */
+static int	avc_lru_hint;		/* index of the buckets to be reclaimed next */
+static int	avc_threshold;		/* threshold to launch cache-reclaiming  */
+static char *avc_unlabeled;		/* system 'unlabeled' label */
 
 /*
  * Hash function
@@ -67,8 +67,8 @@ static char	   *avc_unlabeled;	/* system 'unlabeled' label */
 static uint32
 sepgsql_avc_hash(const char *scontext, const char *tcontext, uint16 tclass)
 {
-	return hash_any((const unsigned char *)scontext, strlen(scontext))
-		^ hash_any((const unsigned char *)tcontext, strlen(tcontext))
+	return hash_any((const unsigned char *) scontext, strlen(scontext))
+		^ hash_any((const unsigned char *) tcontext, strlen(tcontext))
 		^ tclass;
 }
 
@@ -88,7 +88,7 @@ sepgsql_avc_reset(void)
 
 /*
  * Reclaim caches recently unreferenced
- */	
+ */
 static void
 sepgsql_avc_reclaim(void)
 {
@@ -142,15 +142,15 @@ sepgsql_avc_reclaim(void)
  * Access control decisions must be atomic, but multiple system calls may
  * be required to make a decision; thus, when referencing the access vector
  * cache, we must loop until we complete without an intervening cache flush
- * event.  In practice, looping even once should be very rare.  Callers should
+ * event.  In practice, looping even once should be very rare.	Callers should
  * do something like this:
  *
- *   sepgsql_avc_check_valid();
- *   do {
- *           :
- *       <reference to uavc>
- *           :
- *   } while (!sepgsql_avc_check_valid())
+ *	 sepgsql_avc_check_valid();
+ *	 do {
+ *			 :
+ *		 <reference to uavc>
+ *			 :
+ *	 } while (!sepgsql_avc_check_valid())
  *
  * -------------------------------------------------------------------------
  */
@@ -169,7 +169,7 @@ sepgsql_avc_check_valid(void)
 /*
  * sepgsql_avc_unlabeled
  *
- * Returns an alternative label to be applied when no label or an invalid 
+ * Returns an alternative label to be applied when no label or an invalid
  * label would otherwise be assigned.
  */
 static char *
@@ -177,12 +177,12 @@ sepgsql_avc_unlabeled(void)
 {
 	if (!avc_unlabeled)
 	{
-		security_context_t	unlabeled;
+		security_context_t unlabeled;
 
 		if (security_get_initial_context_raw("unlabeled", &unlabeled) < 0)
 			ereport(ERROR,
-                    (errcode(ERRCODE_INTERNAL_ERROR),
-                     errmsg("SELinux: failed to get initial security label: %m")));
+					(errcode(ERRCODE_INTERNAL_ERROR),
+			   errmsg("SELinux: failed to get initial security label: %m")));
 		PG_TRY();
 		{
 			avc_unlabeled = MemoryContextStrdup(avc_mem_cxt, unlabeled);
@@ -200,7 +200,7 @@ sepgsql_avc_unlabeled(void)
 }
 
 /*
- * sepgsql_avc_compute 
+ * sepgsql_avc_compute
  *
  * A fallback path, when cache mishit. It asks SELinux its access control
  * decision for the supplied pair of security context and object class.
@@ -208,24 +208,24 @@ sepgsql_avc_unlabeled(void)
 static avc_cache *
 sepgsql_avc_compute(const char *scontext, const char *tcontext, uint16 tclass)
 {
-	char		   *ucontext = NULL;
-	char		   *ncontext = NULL;
-	MemoryContext	oldctx;
-	avc_cache	   *cache;
-	uint32			hash;
-	int				index;
-	struct av_decision	avd;
+	char	   *ucontext = NULL;
+	char	   *ncontext = NULL;
+	MemoryContext oldctx;
+	avc_cache  *cache;
+	uint32		hash;
+	int			index;
+	struct av_decision avd;
 
 	hash = sepgsql_avc_hash(scontext, tcontext, tclass);
 	index = hash % AVC_NUM_SLOTS;
 
 	/*
-	 * Validation check of the supplied security context.
-	 * Because it always invoke system-call, frequent check should be avoided.
-	 * Unless security policy is reloaded, validation status shall be kept, so
-	 * we also cache whether the supplied security context was valid, or not.
+	 * Validation check of the supplied security context. Because it always
+	 * invoke system-call, frequent check should be avoided. Unless security
+	 * policy is reloaded, validation status shall be kept, so we also cache
+	 * whether the supplied security context was valid, or not.
 	 */
-	if (security_check_context_raw((security_context_t)tcontext) != 0)
+	if (security_check_context_raw((security_context_t) tcontext) != 0)
 		ucontext = sepgsql_avc_unlabeled();
 
 	/*
@@ -237,15 +237,14 @@ sepgsql_avc_compute(const char *scontext, const char *tcontext, uint16 tclass)
 		sepgsql_compute_avd(scontext, ucontext, tclass, &avd);
 
 	/*
-	 * It also caches a security label to be switched when a client
-	 * labeled as 'scontext' executes a procedure labeled as 'tcontext',
-	 * not only access control decision on the procedure.
-	 * The security label to be switched shall be computed uniquely on
-	 * a pair of 'scontext' and 'tcontext', thus, it is reasonable to
-	 * cache the new label on avc, and enables to reduce unnecessary
-	 * system calls.
-	 * It shall be referenced at sepgsql_needs_fmgr_hook to check whether
-	 * the supplied function is a trusted procedure, or not.
+	 * It also caches a security label to be switched when a client labeled as
+	 * 'scontext' executes a procedure labeled as 'tcontext', not only access
+	 * control decision on the procedure. The security label to be switched
+	 * shall be computed uniquely on a pair of 'scontext' and 'tcontext',
+	 * thus, it is reasonable to cache the new label on avc, and enables to
+	 * reduce unnecessary system calls. It shall be referenced at
+	 * sepgsql_needs_fmgr_hook to check whether the supplied function is a
+	 * trusted procedure, or not.
 	 */
 	if (tclass == SEPG_CLASS_DB_PROCEDURE)
 	{
@@ -269,7 +268,7 @@ sepgsql_avc_compute(const char *scontext, const char *tcontext, uint16 tclass)
 
 	cache = palloc0(sizeof(avc_cache));
 
-	cache->hash	= hash;
+	cache->hash = hash;
 	cache->scontext = pstrdup(scontext);
 	cache->tcontext = pstrdup(tcontext);
 	cache->tclass = tclass;
@@ -314,7 +313,7 @@ sepgsql_avc_lookup(const char *scontext, const char *tcontext, uint16 tclass)
 	hash = sepgsql_avc_hash(scontext, tcontext, tclass);
 	index = hash % AVC_NUM_SLOTS;
 
-	foreach (cell, avc_slots[index])
+	foreach(cell, avc_slots[index])
 	{
 		cache = lfirst(cell);
 
@@ -348,14 +347,15 @@ sepgsql_avc_check_perms_label(const char *tcontext,
 							  uint16 tclass, uint32 required,
 							  const char *audit_name, bool abort)
 {
-	char *scontext = sepgsql_get_client_label();
+	char	   *scontext = sepgsql_get_client_label();
 	avc_cache  *cache;
 	uint32		denied;
 	uint32		audited;
 	bool		result;
 
 	sepgsql_avc_check_valid();
-	do {
+	do
+	{
 		result = true;
 
 		/*
@@ -377,16 +377,16 @@ sepgsql_avc_check_perms_label(const char *tcontext,
 			audited = (denied ? (denied & ~0) : (required & ~0));
 		else
 			audited = denied ? (denied & cache->auditdeny)
-							 : (required & cache->auditallow);
+				: (required & cache->auditallow);
 
 		if (denied)
 		{
 			/*
 			 * In permissive mode or permissive domain, violated permissions
 			 * shall be audited to the log files at once, and then implicitly
-			 * allowed to avoid a flood of access denied logs, because
-			 * the purpose of permissive mode/domain is to collect a violation
-			 * log that will make it possible to fix up the security policy.
+			 * allowed to avoid a flood of access denied logs, because the
+			 * purpose of permissive mode/domain is to collect a violation log
+			 * that will make it possible to fix up the security policy.
 			 */
 			if (!sepgsql_getenforce() || cache->permissive)
 				cache->allowed |= required;
@@ -397,10 +397,10 @@ sepgsql_avc_check_perms_label(const char *tcontext,
 
 	/*
 	 * In the case when we have something auditable actions here,
-	 * sepgsql_audit_log shall be called with text representation of
-	 * security labels for both of subject and object.
-	 * It records this access violation, so DBA will be able to find
-	 * out unexpected security problems later.
+	 * sepgsql_audit_log shall be called with text representation of security
+	 * labels for both of subject and object. It records this access
+	 * violation, so DBA will be able to find out unexpected security problems
+	 * later.
 	 */
 	if (audited != 0 &&
 		audit_name != SEPGSQL_AVC_NOAUDIT &&
@@ -428,8 +428,8 @@ sepgsql_avc_check_perms(const ObjectAddress *tobject,
 						uint16 tclass, uint32 required,
 						const char *audit_name, bool abort)
 {
-	char   *tcontext = GetSecurityLabel(tobject, SEPGSQL_LABEL_TAG);
-	bool	rc;
+	char	   *tcontext = GetSecurityLabel(tobject, SEPGSQL_LABEL_TAG);
+	bool		rc;
 
 	rc = sepgsql_avc_check_perms_label(tcontext,
 									   tclass, required,
@@ -450,10 +450,10 @@ sepgsql_avc_check_perms(const ObjectAddress *tobject,
 char *
 sepgsql_avc_trusted_proc(Oid functionId)
 {
-	char		   *scontext = sepgsql_get_client_label();
-	char		   *tcontext;
-	ObjectAddress	tobject;
-	avc_cache	   *cache;
+	char	   *scontext = sepgsql_get_client_label();
+	char	   *tcontext;
+	ObjectAddress tobject;
+	avc_cache  *cache;
 
 	tobject.classId = ProcedureRelationId;
 	tobject.objectId = functionId;
@@ -461,7 +461,8 @@ sepgsql_avc_trusted_proc(Oid functionId)
 	tcontext = GetSecurityLabel(&tobject, SEPGSQL_LABEL_TAG);
 
 	sepgsql_avc_check_valid();
-	do {
+	do
+	{
 		if (tcontext)
 			cache = sepgsql_avc_lookup(scontext, tcontext,
 									   SEPG_CLASS_DB_PROCEDURE);
@@ -492,7 +493,7 @@ sepgsql_avc_exit(int code, Datum arg)
 void
 sepgsql_avc_init(void)
 {
-	int	rc;
+	int			rc;
 
 	/*
 	 * All the avc stuff shall be allocated on avc_mem_cxt
@@ -508,12 +509,11 @@ sepgsql_avc_init(void)
 	avc_threshold = AVC_DEF_THRESHOLD;
 
 	/*
-	 * SELinux allows to mmap(2) its kernel status page in read-only mode
-	 * to inform userspace applications its status updating (such as
-	 * policy reloading) without system-call invocations.
-	 * This feature is only supported in Linux-2.6.38 or later, however,
-	 * libselinux provides a fallback mode to know its status using
-	 * netlink sockets.
+	 * SELinux allows to mmap(2) its kernel status page in read-only mode to
+	 * inform userspace applications its status updating (such as policy
+	 * reloading) without system-call invocations. This feature is only
+	 * supported in Linux-2.6.38 or later, however, libselinux provides a
+	 * fallback mode to know its status using netlink sockets.
 	 */
 	rc = selinux_status_open(1);
 	if (rc < 0)
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index 39a0160587..8dc565a190 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -536,8 +536,7 @@ check_foreign_key(PG_FUNCTION_ARGS)
 
 			/*
 			 * Remember that SPI_prepare places plan in current memory context
-			 * - so, we have to save plan in Top memory context for later
-			 * use.
+			 * - so, we have to save plan in Top memory context for later use.
 			 */
 			if (SPI_keepplan(pplan))
 				/* internal error */
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 641a8c3425..958a496b24 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -69,7 +69,7 @@ vacuumlo(const char *database, const struct _param * param)
 	int			i;
 	static char *password = NULL;
 	bool		new_pass;
-	bool        success = true;
+	bool		success = true;
 
 	/* Note: password can be carried over from a previous call */
 	if (param->pg_prompt == TRI_YES && password == NULL)
@@ -261,8 +261,8 @@ vacuumlo(const char *database, const struct _param * param)
 	 * We don't want to run each delete as an individual transaction, because
 	 * the commit overhead would be high.  However, since 9.0 the backend will
 	 * acquire a lock per deleted LO, so deleting too many LOs per transaction
-	 * risks running out of room in the shared-memory lock table.
-	 * Accordingly, we delete up to transaction_limit LOs per transaction.
+	 * risks running out of room in the shared-memory lock table. Accordingly,
+	 * we delete up to transaction_limit LOs per transaction.
 	 */
 	res = PQexec(conn, "begin");
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -459,8 +459,8 @@ main(int argc, char **argv)
 				if (param.transaction_limit < 0)
 				{
 					fprintf(stderr,
-				"%s: transaction limit must not be negative (0 disables)\n",
-						progname);
+							"%s: transaction limit must not be negative (0 disables)\n",
+							progname);
 					exit(1);
 				}
 				break;
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index 2ddee59fcb..660d25c349 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -702,126 +702,126 @@ xpath_table(PG_FUNCTION_ARGS)
 
 	PG_TRY();
 	{
-	/* For each row i.e. document returned from SPI */
-	for (i = 0; i < proc; i++)
-	{
-		char	   *pkey;
-		char	   *xmldoc;
-		xmlXPathContextPtr ctxt;
-		xmlXPathObjectPtr res;
-		xmlChar    *resstr;
-		xmlXPathCompExprPtr comppath;
-
-		/* Extract the row data as C Strings */
-		spi_tuple = tuptable->vals[i];
-		pkey = SPI_getvalue(spi_tuple, spi_tupdesc, 1);
-		xmldoc = SPI_getvalue(spi_tuple, spi_tupdesc, 2);
-
-		/*
-		 * Clear the values array, so that not-well-formed documents return
-		 * NULL in all columns.  Note that this also means that spare columns
-		 * will be NULL.
-		 */
-		for (j = 0; j < ret_tupdesc->natts; j++)
-			values[j] = NULL;
-
-		/* Insert primary key */
-		values[0] = pkey;
-
-		/* Parse the document */
-		if (xmldoc)
-			doctree = xmlParseMemory(xmldoc, strlen(xmldoc));
-		else	/* treat NULL as not well-formed */
-			doctree = NULL;
-
-		if (doctree == NULL)
+		/* For each row i.e. document returned from SPI */
+		for (i = 0; i < proc; i++)
 		{
-			/* not well-formed, so output all-NULL tuple */
-			ret_tuple = BuildTupleFromCStrings(attinmeta, values);
-			tuplestore_puttuple(tupstore, ret_tuple);
-			heap_freetuple(ret_tuple);
-		}
-		else
-		{
-			/* New loop here - we have to deal with nodeset results */
-			rownr = 0;
-
-			do
+			char	   *pkey;
+			char	   *xmldoc;
+			xmlXPathContextPtr ctxt;
+			xmlXPathObjectPtr res;
+			xmlChar    *resstr;
+			xmlXPathCompExprPtr comppath;
+
+			/* Extract the row data as C Strings */
+			spi_tuple = tuptable->vals[i];
+			pkey = SPI_getvalue(spi_tuple, spi_tupdesc, 1);
+			xmldoc = SPI_getvalue(spi_tuple, spi_tupdesc, 2);
+
+			/*
+			 * Clear the values array, so that not-well-formed documents
+			 * return NULL in all columns.	Note that this also means that
+			 * spare columns will be NULL.
+			 */
+			for (j = 0; j < ret_tupdesc->natts; j++)
+				values[j] = NULL;
+
+			/* Insert primary key */
+			values[0] = pkey;
+
+			/* Parse the document */
+			if (xmldoc)
+				doctree = xmlParseMemory(xmldoc, strlen(xmldoc));
+			else	/* treat NULL as not well-formed */
+				doctree = NULL;
+
+			if (doctree == NULL)
 			{
-				/* Now evaluate the set of xpaths. */
-				had_values = false;
-				for (j = 0; j < numpaths; j++)
+				/* not well-formed, so output all-NULL tuple */
+				ret_tuple = BuildTupleFromCStrings(attinmeta, values);
+				tuplestore_puttuple(tupstore, ret_tuple);
+				heap_freetuple(ret_tuple);
+			}
+			else
+			{
+				/* New loop here - we have to deal with nodeset results */
+				rownr = 0;
+
+				do
 				{
-					ctxt = xmlXPathNewContext(doctree);
-					ctxt->node = xmlDocGetRootElement(doctree);
+					/* Now evaluate the set of xpaths. */
+					had_values = false;
+					for (j = 0; j < numpaths; j++)
+					{
+						ctxt = xmlXPathNewContext(doctree);
+						ctxt->node = xmlDocGetRootElement(doctree);
 
-					/* compile the path */
-					comppath = xmlXPathCompile(xpaths[j]);
-					if (comppath == NULL)
-						xml_ereport(xmlerrcxt, ERROR,
-									ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
-									"XPath Syntax Error");
+						/* compile the path */
+						comppath = xmlXPathCompile(xpaths[j]);
+						if (comppath == NULL)
+							xml_ereport(xmlerrcxt, ERROR,
+										ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+										"XPath Syntax Error");
 
-					/* Now evaluate the path expression. */
-					res = xmlXPathCompiledEval(comppath, ctxt);
-					xmlXPathFreeCompExpr(comppath);
+						/* Now evaluate the path expression. */
+						res = xmlXPathCompiledEval(comppath, ctxt);
+						xmlXPathFreeCompExpr(comppath);
 
-					if (res != NULL)
-					{
-						switch (res->type)
+						if (res != NULL)
 						{
-							case XPATH_NODESET:
-								/* We see if this nodeset has enough nodes */
-								if (res->nodesetval != NULL &&
-									rownr < res->nodesetval->nodeNr)
-								{
-									resstr = xmlXPathCastNodeToString(res->nodesetval->nodeTab[rownr]);
-									had_values = true;
-								}
-								else
-									resstr = NULL;
-
-								break;
-
-							case XPATH_STRING:
-								resstr = xmlStrdup(res->stringval);
-								break;
-
-							default:
-								elog(NOTICE, "unsupported XQuery result: %d", res->type);
-								resstr = xmlStrdup((const xmlChar *) "<unsupported/>");
+							switch (res->type)
+							{
+								case XPATH_NODESET:
+									/* We see if this nodeset has enough nodes */
+									if (res->nodesetval != NULL &&
+										rownr < res->nodesetval->nodeNr)
+									{
+										resstr = xmlXPathCastNodeToString(res->nodesetval->nodeTab[rownr]);
+										had_values = true;
+									}
+									else
+										resstr = NULL;
+
+									break;
+
+								case XPATH_STRING:
+									resstr = xmlStrdup(res->stringval);
+									break;
+
+								default:
+									elog(NOTICE, "unsupported XQuery result: %d", res->type);
+									resstr = xmlStrdup((const xmlChar *) "<unsupported/>");
+							}
+
+							/*
+							 * Insert this into the appropriate column in the
+							 * result tuple.
+							 */
+							values[j + 1] = (char *) resstr;
 						}
-
-						/*
-						 * Insert this into the appropriate column in the
-						 * result tuple.
-						 */
-						values[j + 1] = (char *) resstr;
+						xmlXPathFreeContext(ctxt);
 					}
-					xmlXPathFreeContext(ctxt);
-				}
 
-				/* Now add the tuple to the output, if there is one. */
-				if (had_values)
-				{
-					ret_tuple = BuildTupleFromCStrings(attinmeta, values);
-					tuplestore_puttuple(tupstore, ret_tuple);
-					heap_freetuple(ret_tuple);
-				}
+					/* Now add the tuple to the output, if there is one. */
+					if (had_values)
+					{
+						ret_tuple = BuildTupleFromCStrings(attinmeta, values);
+						tuplestore_puttuple(tupstore, ret_tuple);
+						heap_freetuple(ret_tuple);
+					}
 
-				rownr++;
-			} while (had_values);
-		}
+					rownr++;
+				} while (had_values);
+			}
 
-		if (doctree != NULL)
-			xmlFreeDoc(doctree);
-		doctree = NULL;
+			if (doctree != NULL)
+				xmlFreeDoc(doctree);
+			doctree = NULL;
 
-		if (pkey)
-			pfree(pkey);
-		if (xmldoc)
-			pfree(xmldoc);
-	}
+			if (pkey)
+				pfree(pkey);
+			if (xmldoc)
+				pfree(xmldoc);
+		}
 	}
 	PG_CATCH();
 	{
diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c
index ba1171a041..a93931d261 100644
--- a/contrib/xml2/xslt_proc.c
+++ b/contrib/xml2/xslt_proc.c
@@ -85,40 +85,40 @@ xslt_process(PG_FUNCTION_ARGS)
 	{
 		/* Check to see if document is a file or a literal */
 
-	if (VARDATA(doct)[0] == '<')
-		doctree = xmlParseMemory((char *) VARDATA(doct), VARSIZE(doct) - VARHDRSZ);
-	else
-		doctree = xmlParseFile(text_to_cstring(doct));
-
-	if (doctree == NULL)
-		xml_ereport(xmlerrcxt, ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
-					"error parsing XML document");
+		if (VARDATA(doct)[0] == '<')
+			doctree = xmlParseMemory((char *) VARDATA(doct), VARSIZE(doct) - VARHDRSZ);
+		else
+			doctree = xmlParseFile(text_to_cstring(doct));
 
-	/* Same for stylesheet */
-	if (VARDATA(ssheet)[0] == '<')
-	{
-		ssdoc = xmlParseMemory((char *) VARDATA(ssheet),
-							   VARSIZE(ssheet) - VARHDRSZ);
-		if (ssdoc == NULL)
+		if (doctree == NULL)
 			xml_ereport(xmlerrcxt, ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
-						"error parsing stylesheet as XML document");
+						"error parsing XML document");
 
-		stylesheet = xsltParseStylesheetDoc(ssdoc);
-	}
-	else
-		stylesheet = xsltParseStylesheetFile((xmlChar *) text_to_cstring(ssheet));
+		/* Same for stylesheet */
+		if (VARDATA(ssheet)[0] == '<')
+		{
+			ssdoc = xmlParseMemory((char *) VARDATA(ssheet),
+								   VARSIZE(ssheet) - VARHDRSZ);
+			if (ssdoc == NULL)
+				xml_ereport(xmlerrcxt, ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+							"error parsing stylesheet as XML document");
+
+			stylesheet = xsltParseStylesheetDoc(ssdoc);
+		}
+		else
+			stylesheet = xsltParseStylesheetFile((xmlChar *) text_to_cstring(ssheet));
 
-	if (stylesheet == NULL)
-		xml_ereport(xmlerrcxt, ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
-					"failed to parse stylesheet");
+		if (stylesheet == NULL)
+			xml_ereport(xmlerrcxt, ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+						"failed to parse stylesheet");
 
-	restree = xsltApplyStylesheet(stylesheet, doctree, params);
+		restree = xsltApplyStylesheet(stylesheet, doctree, params);
 
-	if (restree == NULL)
-		xml_ereport(xmlerrcxt, ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
-					"failed to apply stylesheet");
+		if (restree == NULL)
+			xml_ereport(xmlerrcxt, ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+						"failed to apply stylesheet");
 
-	resstat = xsltSaveResultToString(&resstr, &reslen, restree, stylesheet);
+		resstat = xsltSaveResultToString(&resstr, &reslen, restree, stylesheet);
 	}
 	PG_CATCH();
 	{
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 1efaaee1a8..783590ea55 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -27,7 +27,7 @@
 /* non-export function prototypes */
 static void gistfixsplit(GISTInsertState *state, GISTSTATE *giststate);
 static bool gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,
-				GISTSTATE *giststate, IndexTuple tuple, OffsetNumber oldoffnum);
+			 GISTSTATE *giststate, IndexTuple tuple, OffsetNumber oldoffnum);
 static bool gistinserttuples(GISTInsertState *state, GISTInsertStack *stack,
 				 GISTSTATE *giststate,
 				 IndexTuple *tuples, int ntup, OffsetNumber oldoffnum,
@@ -781,8 +781,8 @@ gistFindPath(Relation r, BlockNumber child, OffsetNumber *downlinkoffnum)
 		{
 			/*
 			 * Page was split while we looked elsewhere. We didn't see the
-			 * downlink to the right page when we scanned the parent, so
-			 * add it to the queue now.
+			 * downlink to the right page when we scanned the parent, so add
+			 * it to the queue now.
 			 *
 			 * Put the right page ahead of the queue, so that we visit it
 			 * next. That's important, because if this is the lowest internal
@@ -829,7 +829,7 @@ gistFindPath(Relation r, BlockNumber child, OffsetNumber *downlinkoffnum)
 
 	elog(ERROR, "failed to re-find parent of a page in index \"%s\", block %u",
 		 RelationGetRelationName(r), child);
-	return NULL; /* keep compiler quiet */
+	return NULL;				/* keep compiler quiet */
 }
 
 /*
@@ -1046,7 +1046,7 @@ gistfixsplit(GISTInsertState *state, GISTSTATE *giststate)
  */
 static bool
 gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,
-				GISTSTATE *giststate, IndexTuple tuple, OffsetNumber oldoffnum)
+			  GISTSTATE *giststate, IndexTuple tuple, OffsetNumber oldoffnum)
 {
 	return gistinserttuples(state, stack, giststate, &tuple, 1, oldoffnum,
 							InvalidBuffer, InvalidBuffer, false, false);
@@ -1308,7 +1308,7 @@ initGISTstate(Relation index)
 	giststate = (GISTSTATE *) palloc(sizeof(GISTSTATE));
 
 	giststate->scanCxt = scanCxt;
-	giststate->tempCxt = scanCxt;	/* caller must change this if needed */
+	giststate->tempCxt = scanCxt;		/* caller must change this if needed */
 	giststate->tupdesc = index->rd_att;
 
 	for (i = 0; i < index->rd_att->natts; i++)
diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c
index 712e59ac90..8caf485676 100644
--- a/src/backend/access/gist/gistbuild.c
+++ b/src/backend/access/gist/gistbuild.c
@@ -48,7 +48,7 @@ typedef enum
 								 * before switching to the buffering build
 								 * mode */
 	GIST_BUFFERING_ACTIVE		/* in buffering build mode */
-}	GistBufferingMode;
+} GistBufferingMode;
 
 /* Working state for gistbuild and its callback */
 typedef struct
@@ -263,7 +263,7 @@ gistValidateBufferingOption(char *value)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("invalid value for \"buffering\" option"),
-			   errdetail("Valid values are \"on\", \"off\", and \"auto\".")));
+			  errdetail("Valid values are \"on\", \"off\", and \"auto\".")));
 	}
 }
 
@@ -567,7 +567,7 @@ gistProcessItup(GISTBuildState *buildstate, IndexTuple itup,
 	BlockNumber childblkno;
 	Buffer		buffer;
 	bool		result = false;
-	BlockNumber	blkno;
+	BlockNumber blkno;
 	int			level;
 	OffsetNumber downlinkoffnum = InvalidOffsetNumber;
 	BlockNumber parentblkno = InvalidBlockNumber;
@@ -623,7 +623,7 @@ gistProcessItup(GISTBuildState *buildstate, IndexTuple itup,
 		{
 			gistbufferinginserttuples(buildstate, buffer, level,
 									  &newtup, 1, childoffnum,
-									  InvalidBlockNumber, InvalidOffsetNumber);
+									InvalidBlockNumber, InvalidOffsetNumber);
 			/* gistbufferinginserttuples() released the buffer */
 		}
 		else
@@ -716,26 +716,26 @@ gistbufferinginserttuples(GISTBuildState *buildstate, Buffer buffer, int level,
 
 		/*
 		 * All the downlinks on the old root page are now on one of the child
-		 * pages. Visit all the new child pages to memorize the parents of
-		 * the grandchildren.
+		 * pages. Visit all the new child pages to memorize the parents of the
+		 * grandchildren.
 		 */
 		if (gfbb->rootlevel > 1)
 		{
 			maxoff = PageGetMaxOffsetNumber(page);
 			for (off = FirstOffsetNumber; off <= maxoff; off++)
 			{
-				ItemId iid = PageGetItemId(page, off);
-				IndexTuple idxtuple = (IndexTuple) PageGetItem(page, iid);
+				ItemId		iid = PageGetItemId(page, off);
+				IndexTuple	idxtuple = (IndexTuple) PageGetItem(page, iid);
 				BlockNumber childblkno = ItemPointerGetBlockNumber(&(idxtuple->t_tid));
-				Buffer childbuf = ReadBuffer(buildstate->indexrel, childblkno);
+				Buffer		childbuf = ReadBuffer(buildstate->indexrel, childblkno);
 
 				LockBuffer(childbuf, GIST_SHARE);
 				gistMemorizeAllDownlinks(buildstate, childbuf);
 				UnlockReleaseBuffer(childbuf);
 
 				/*
-				 * Also remember that the parent of the new child page is
-				 * the root block.
+				 * Also remember that the parent of the new child page is the
+				 * root block.
 				 */
 				gistMemorizeParent(buildstate, childblkno, GIST_ROOT_BLKNO);
 			}
@@ -789,8 +789,8 @@ gistbufferinginserttuples(GISTBuildState *buildstate, Buffer buffer, int level,
 			 * Remember the parent of each new child page in our parent map.
 			 * This assumes that the downlinks fit on the parent page. If the
 			 * parent page is split, too, when we recurse up to insert the
-			 * downlinks, the recursive gistbufferinginserttuples() call
-			 * will update the map again.
+			 * downlinks, the recursive gistbufferinginserttuples() call will
+			 * update the map again.
 			 */
 			if (level > 0)
 				gistMemorizeParent(buildstate,
@@ -879,8 +879,9 @@ gistBufferingFindCorrectParent(GISTBuildState *buildstate,
 	if (parent == *parentblkno && *parentblkno != InvalidBlockNumber &&
 		*downlinkoffnum != InvalidOffsetNumber && *downlinkoffnum <= maxoff)
 	{
-		ItemId iid = PageGetItemId(page, *downlinkoffnum);
-		IndexTuple idxtuple = (IndexTuple) PageGetItem(page, iid);
+		ItemId		iid = PageGetItemId(page, *downlinkoffnum);
+		IndexTuple	idxtuple = (IndexTuple) PageGetItem(page, iid);
+
 		if (ItemPointerGetBlockNumber(&(idxtuple->t_tid)) == childblkno)
 		{
 			/* Still there */
@@ -889,16 +890,17 @@ gistBufferingFindCorrectParent(GISTBuildState *buildstate,
 	}
 
 	/*
-	 * Downlink was not at the offset where it used to be. Scan the page
-	 * to find it. During normal gist insertions, it might've moved to another
-	 * page, to the right, but during a buffering build, we keep track of
-	 * the parent of each page in the lookup table so we should always know
-	 * what page it's on.
+	 * Downlink was not at the offset where it used to be. Scan the page to
+	 * find it. During normal gist insertions, it might've moved to another
+	 * page, to the right, but during a buffering build, we keep track of the
+	 * parent of each page in the lookup table so we should always know what
+	 * page it's on.
 	 */
 	for (off = FirstOffsetNumber; off <= maxoff; off = OffsetNumberNext(off))
 	{
-		ItemId iid = PageGetItemId(page, off);
-		IndexTuple idxtuple = (IndexTuple) PageGetItem(page, iid);
+		ItemId		iid = PageGetItemId(page, off);
+		IndexTuple	idxtuple = (IndexTuple) PageGetItem(page, iid);
+
 		if (ItemPointerGetBlockNumber(&(idxtuple->t_tid)) == childblkno)
 		{
 			/* yes!!, found it */
@@ -908,7 +910,7 @@ gistBufferingFindCorrectParent(GISTBuildState *buildstate,
 	}
 
 	elog(ERROR, "failed to re-find parent for block %u", childblkno);
-	return InvalidBuffer; /* keep compiler quiet */
+	return InvalidBuffer;		/* keep compiler quiet */
 }
 
 /*
@@ -1129,7 +1131,7 @@ gistGetMaxLevel(Relation index)
 
 typedef struct
 {
-	BlockNumber childblkno; /* hash key */
+	BlockNumber childblkno;		/* hash key */
 	BlockNumber parentblkno;
 } ParentMapEntry;
 
@@ -1156,9 +1158,9 @@ gistMemorizeParent(GISTBuildState *buildstate, BlockNumber child, BlockNumber pa
 	bool		found;
 
 	entry = (ParentMapEntry *) hash_search(buildstate->parentMap,
-										  (const void *) &child,
-										  HASH_ENTER,
-										  &found);
+										   (const void *) &child,
+										   HASH_ENTER,
+										   &found);
 	entry->parentblkno = parent;
 }
 
@@ -1171,16 +1173,17 @@ gistMemorizeAllDownlinks(GISTBuildState *buildstate, Buffer parentbuf)
 	OffsetNumber maxoff;
 	OffsetNumber off;
 	BlockNumber parentblkno = BufferGetBlockNumber(parentbuf);
-	Page page = BufferGetPage(parentbuf);
+	Page		page = BufferGetPage(parentbuf);
 
 	Assert(!GistPageIsLeaf(page));
 
 	maxoff = PageGetMaxOffsetNumber(page);
 	for (off = FirstOffsetNumber; off <= maxoff; off++)
 	{
-		ItemId iid = PageGetItemId(page, off);
-		IndexTuple idxtuple = (IndexTuple) PageGetItem(page, iid);
+		ItemId		iid = PageGetItemId(page, off);
+		IndexTuple	idxtuple = (IndexTuple) PageGetItem(page, iid);
 		BlockNumber childblkno = ItemPointerGetBlockNumber(&(idxtuple->t_tid));
+
 		gistMemorizeParent(buildstate, childblkno, parentblkno);
 	}
 }
@@ -1193,9 +1196,9 @@ gistGetParent(GISTBuildState *buildstate, BlockNumber child)
 
 	/* Find node buffer in hash table */
 	entry = (ParentMapEntry *) hash_search(buildstate->parentMap,
-										  (const void *) &child,
-										  HASH_FIND,
-										  &found);
+										   (const void *) &child,
+										   HASH_FIND,
+										   &found);
 	if (!found)
 		elog(ERROR, "could not find parent of block %d in lookup table", child);
 
diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c
index 3feca263a7..39aec856f9 100644
--- a/src/backend/access/gist/gistbuildbuffers.c
+++ b/src/backend/access/gist/gistbuildbuffers.c
@@ -528,7 +528,7 @@ typedef struct
 	bool		isnull[INDEX_MAX_KEYS];
 	GISTPageSplitInfo *splitinfo;
 	GISTNodeBuffer *nodeBuffer;
-}	RelocationBufferInfo;
+} RelocationBufferInfo;
 
 /*
  * At page split, distribute tuples from the buffer of the split page to
diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c
index d97c64ede3..09e911d098 100644
--- a/src/backend/access/gist/gistproc.c
+++ b/src/backend/access/gist/gistproc.c
@@ -244,7 +244,7 @@ typedef struct
 	int			index;
 	/* Delta between penalties of entry insertion into different groups */
 	double		delta;
-}	CommonEntry;
+} CommonEntry;
 
 /*
  * Context for g_box_consider_split. Contains information about currently
@@ -267,7 +267,7 @@ typedef struct
 	int			dim;			/* axis of this split */
 	double		range;			/* width of general MBR projection to the
 								 * selected axis */
-}	ConsiderSplitContext;
+} ConsiderSplitContext;
 
 /*
  * Interval represents projection of box to axis.
@@ -276,7 +276,7 @@ typedef struct
 {
 	double		lower,
 				upper;
-}	SplitInterval;
+} SplitInterval;
 
 /*
  * Interval comparison function by lower bound of the interval;
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index bf139de824..c9fc9ba97f 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -124,7 +124,7 @@ gistbeginscan(PG_FUNCTION_ARGS)
 	so->giststate = giststate;
 	giststate->tempCxt = createTempGistContext();
 	so->queue = NULL;
-	so->queueCxt = giststate->scanCxt;			/* see gistrescan */
+	so->queueCxt = giststate->scanCxt;	/* see gistrescan */
 
 	/* workspaces with size dependent on numberOfOrderBys: */
 	so->tmpTreeItem = palloc(GSTIHDRSZ + sizeof(double) * scan->numberOfOrderBys);
diff --git a/src/backend/access/gist/gistsplit.c b/src/backend/access/gist/gistsplit.c
index 2ec69a60d4..739fc597ce 100644
--- a/src/backend/access/gist/gistsplit.c
+++ b/src/backend/access/gist/gistsplit.c
@@ -581,8 +581,7 @@ gistSplitByKey(Relation r, Page page, IndexTuple *itup, int len, GISTSTATE *gist
 			if (v->spl_equiv == NULL)
 			{
 				/*
-				 * simple case: left and right keys for attno column are
-				 * equal
+				 * simple case: left and right keys for attno column are equal
 				 */
 				gistSplitByKey(r, page, itup, len, giststate, v, entryvec, attno + 1);
 			}
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 96dabdb48a..bbea5e4eac 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -391,7 +391,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf,
 	uint32		ovflbitno;
 	int32		bitmappage,
 				bitmapbit;
-	Bucket		bucket PG_USED_FOR_ASSERTS_ONLY;
+	Bucket bucket PG_USED_FOR_ASSERTS_ONLY;
 
 	/* Get information from the doomed page */
 	_hash_checkpage(rel, ovflbuf, LH_OVERFLOW_PAGE);
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 2d81383ae8..9519e73e54 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -223,9 +223,9 @@ heapgetpage(HeapScanDesc scan, BlockNumber page)
 	}
 
 	/*
-	 * Be sure to check for interrupts at least once per page.  Checks at
-	 * higher code levels won't be able to stop a seqscan that encounters
-	 * many pages' worth of consecutive dead tuples.
+	 * Be sure to check for interrupts at least once per page.	Checks at
+	 * higher code levels won't be able to stop a seqscan that encounters many
+	 * pages' worth of consecutive dead tuples.
 	 */
 	CHECK_FOR_INTERRUPTS();
 
@@ -997,8 +997,8 @@ relation_openrv(const RangeVar *relation, LOCKMODE lockmode)
  *
  *		Same as relation_openrv, but with an additional missing_ok argument
  *		allowing a NULL return rather than an error if the relation is not
- *      found.  (Note that some other causes, such as permissions problems,
- *      will still result in an ereport.)
+ *		found.	(Note that some other causes, such as permissions problems,
+ *		will still result in an ereport.)
  * ----------------
  */
 Relation
@@ -1105,7 +1105,7 @@ heap_openrv(const RangeVar *relation, LOCKMODE lockmode)
  *		by a RangeVar node
  *
  *		As above, but optionally return NULL instead of failing for
- *      relation-not-found.
+ *		relation-not-found.
  * ----------------
  */
 Relation
@@ -1588,10 +1588,10 @@ heap_hot_search_buffer(ItemPointer tid, Relation relation, Buffer buffer,
 
 		/*
 		 * When first_call is true (and thus, skip is initially false) we'll
-		 * return the first tuple we find.  But on later passes, heapTuple
+		 * return the first tuple we find.	But on later passes, heapTuple
 		 * will initially be pointing to the tuple we returned last time.
-		 * Returning it again would be incorrect (and would loop forever),
-		 * so we skip it and return the next match we find.
+		 * Returning it again would be incorrect (and would loop forever), so
+		 * we skip it and return the next match we find.
 		 */
 		if (!skip)
 		{
@@ -1651,7 +1651,7 @@ heap_hot_search(ItemPointer tid, Relation relation, Snapshot snapshot,
 {
 	bool		result;
 	Buffer		buffer;
-	HeapTupleData	heapTuple;
+	HeapTupleData heapTuple;
 
 	buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
 	LockBuffer(buffer, BUFFER_LOCK_SHARE);
@@ -1885,14 +1885,14 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 	heaptup = heap_prepare_insert(relation, tup, xid, cid, options);
 
 	/*
-	 * We're about to do the actual insert -- but check for conflict first,
-	 * to avoid possibly having to roll back work we've just done.
+	 * We're about to do the actual insert -- but check for conflict first, to
+	 * avoid possibly having to roll back work we've just done.
 	 *
-	 * For a heap insert, we only need to check for table-level SSI locks.
-	 * Our new tuple can't possibly conflict with existing tuple locks, and
-	 * heap page locks are only consolidated versions of tuple locks; they do
-	 * not lock "gaps" as index page locks do.  So we don't need to identify
-	 * a buffer before making the call.
+	 * For a heap insert, we only need to check for table-level SSI locks. Our
+	 * new tuple can't possibly conflict with existing tuple locks, and heap
+	 * page locks are only consolidated versions of tuple locks; they do not
+	 * lock "gaps" as index page locks do.	So we don't need to identify a
+	 * buffer before making the call.
 	 */
 	CheckForSerializableConflictIn(relation, NULL, InvalidBuffer);
 
@@ -2123,11 +2123,11 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 	 * We're about to do the actual inserts -- but check for conflict first,
 	 * to avoid possibly having to roll back work we've just done.
 	 *
-	 * For a heap insert, we only need to check for table-level SSI locks.
-	 * Our new tuple can't possibly conflict with existing tuple locks, and
-	 * heap page locks are only consolidated versions of tuple locks; they do
-	 * not lock "gaps" as index page locks do.  So we don't need to identify
-	 * a buffer before making the call.
+	 * For a heap insert, we only need to check for table-level SSI locks. Our
+	 * new tuple can't possibly conflict with existing tuple locks, and heap
+	 * page locks are only consolidated versions of tuple locks; they do not
+	 * lock "gaps" as index page locks do.	So we don't need to identify a
+	 * buffer before making the call.
 	 */
 	CheckForSerializableConflictIn(relation, NULL, InvalidBuffer);
 
@@ -2137,12 +2137,11 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 		Buffer		buffer;
 		Buffer		vmbuffer = InvalidBuffer;
 		bool		all_visible_cleared = false;
-		int nthispage;
+		int			nthispage;
 
 		/*
-		 * Find buffer where at least the next tuple will fit.  If the page
-		 * is all-visible, this will also pin the requisite visibility map
-		 * page.
+		 * Find buffer where at least the next tuple will fit.	If the page is
+		 * all-visible, this will also pin the requisite visibility map page.
 		 */
 		buffer = RelationGetBufferForTuple(relation, heaptuples[ndone]->t_len,
 										   InvalidBuffer, options, bistate,
@@ -2358,7 +2357,7 @@ heap_delete(Relation relation, ItemPointer tid,
 	ItemId		lp;
 	HeapTupleData tp;
 	Page		page;
-	BlockNumber	block;
+	BlockNumber block;
 	Buffer		buffer;
 	Buffer		vmbuffer = InvalidBuffer;
 	bool		have_tuple_lock = false;
@@ -2372,10 +2371,10 @@ heap_delete(Relation relation, ItemPointer tid,
 	page = BufferGetPage(buffer);
 
 	/*
-	 * Before locking the buffer, pin the visibility map page if it appears
-	 * to be necessary.  Since we haven't got the lock yet, someone else might
-	 * be in the middle of changing this, so we'll need to recheck after
-	 * we have the lock.
+	 * Before locking the buffer, pin the visibility map page if it appears to
+	 * be necessary.  Since we haven't got the lock yet, someone else might be
+	 * in the middle of changing this, so we'll need to recheck after we have
+	 * the lock.
 	 */
 	if (PageIsAllVisible(page))
 		visibilitymap_pin(relation, block, &vmbuffer);
@@ -2717,7 +2716,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 	HeapTupleData oldtup;
 	HeapTuple	heaptup;
 	Page		page;
-	BlockNumber	block;
+	BlockNumber block;
 	Buffer		buffer,
 				newbuf,
 				vmbuffer = InvalidBuffer,
@@ -2753,10 +2752,10 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 	page = BufferGetPage(buffer);
 
 	/*
-	 * Before locking the buffer, pin the visibility map page if it appears
-	 * to be necessary.  Since we haven't got the lock yet, someone else might
-	 * be in the middle of changing this, so we'll need to recheck after
-	 * we have the lock.
+	 * Before locking the buffer, pin the visibility map page if it appears to
+	 * be necessary.  Since we haven't got the lock yet, someone else might be
+	 * in the middle of changing this, so we'll need to recheck after we have
+	 * the lock.
 	 */
 	if (PageIsAllVisible(page))
 		visibilitymap_pin(relation, block, &vmbuffer);
@@ -2900,11 +2899,11 @@ l2:
 
 	/*
 	 * If we didn't pin the visibility map page and the page has become all
-	 * visible while we were busy locking the buffer, or during some subsequent
-	 * window during which we had it unlocked, we'll have to unlock and
-	 * re-lock, to avoid holding the buffer lock across an I/O.  That's a bit
-	 * unfortunate, esepecially since we'll now have to recheck whether the
-	 * tuple has been locked or updated under us, but hopefully it won't
+	 * visible while we were busy locking the buffer, or during some
+	 * subsequent window during which we had it unlocked, we'll have to unlock
+	 * and re-lock, to avoid holding the buffer lock across an I/O.  That's a
+	 * bit unfortunate, esepecially since we'll now have to recheck whether
+	 * the tuple has been locked or updated under us, but hopefully it won't
 	 * happen very often.
 	 */
 	if (vmbuffer == InvalidBuffer && PageIsAllVisible(page))
@@ -3196,11 +3195,11 @@ l2:
 
 	/*
 	 * Mark old tuple for invalidation from system caches at next command
-	 * boundary, and mark the new tuple for invalidation in case we abort.
-	 * We have to do this before releasing the buffer because oldtup is in
-	 * the buffer.  (heaptup is all in local memory, but it's necessary to
-	 * process both tuple versions in one call to inval.c so we can avoid
-	 * redundant sinval messages.)
+	 * boundary, and mark the new tuple for invalidation in case we abort. We
+	 * have to do this before releasing the buffer because oldtup is in the
+	 * buffer.	(heaptup is all in local memory, but it's necessary to process
+	 * both tuple versions in one call to inval.c so we can avoid redundant
+	 * sinval messages.)
 	 */
 	CacheInvalidateHeapTuple(relation, &oldtup, heaptup);
 
@@ -4069,7 +4068,7 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid)
  */
 bool
 heap_tuple_needs_freeze(HeapTupleHeader tuple, TransactionId cutoff_xid,
-				  Buffer buf)
+						Buffer buf)
 {
 	TransactionId xid;
 
@@ -4368,9 +4367,9 @@ log_heap_freeze(Relation reln, Buffer buffer,
 }
 
 /*
- * Perform XLogInsert for a heap-visible operation.	 'block' is the block
+ * Perform XLogInsert for a heap-visible operation.  'block' is the block
  * being marked all-visible, and vm_buffer is the buffer containing the
- * corresponding visibility map block.  Both should have already been modified
+ * corresponding visibility map block.	Both should have already been modified
  * and dirtied.
  */
 XLogRecPtr
@@ -4705,7 +4704,7 @@ heap_xlog_visible(XLogRecPtr lsn, XLogRecord *record)
 	Page		page;
 
 	/*
-	 * Read the heap page, if it still exists.  If the heap file has been
+	 * Read the heap page, if it still exists.	If the heap file has been
 	 * dropped or truncated later in recovery, this might fail.  In that case,
 	 * there's no point in doing anything further, since the visibility map
 	 * will have to be cleared out at the same time.
@@ -4731,17 +4730,16 @@ heap_xlog_visible(XLogRecPtr lsn, XLogRecord *record)
 	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
 
 	/*
-	 * We don't bump the LSN of the heap page when setting the visibility
-	 * map bit, because that would generate an unworkable volume of
-	 * full-page writes.  This exposes us to torn page hazards, but since
-	 * we're not inspecting the existing page contents in any way, we
-	 * don't care.
+	 * We don't bump the LSN of the heap page when setting the visibility map
+	 * bit, because that would generate an unworkable volume of full-page
+	 * writes.	This exposes us to torn page hazards, but since we're not
+	 * inspecting the existing page contents in any way, we don't care.
 	 *
-	 * However, all operations that clear the visibility map bit *do* bump
-	 * the LSN, and those operations will only be replayed if the XLOG LSN
-	 * follows the page LSN.  Thus, if the page LSN has advanced past our
-	 * XLOG record's LSN, we mustn't mark the page all-visible, because
-	 * the subsequent update won't be replayed to clear the flag.
+	 * However, all operations that clear the visibility map bit *do* bump the
+	 * LSN, and those operations will only be replayed if the XLOG LSN follows
+	 * the page LSN.  Thus, if the page LSN has advanced past our XLOG
+	 * record's LSN, we mustn't mark the page all-visible, because the
+	 * subsequent update won't be replayed to clear the flag.
 	 */
 	if (!XLByteLE(lsn, PageGetLSN(page)))
 	{
@@ -4772,10 +4770,10 @@ heap_xlog_visible(XLogRecPtr lsn, XLogRecord *record)
 		 * Don't set the bit if replay has already passed this point.
 		 *
 		 * It might be safe to do this unconditionally; if replay has past
-		 * this point, we'll replay at least as far this time as we did before,
-		 * and if this bit needs to be cleared, the record responsible for
-		 * doing so should be again replayed, and clear it.  For right now,
-		 * out of an abundance of conservatism, we use the same test here
+		 * this point, we'll replay at least as far this time as we did
+		 * before, and if this bit needs to be cleared, the record responsible
+		 * for doing so should be again replayed, and clear it.  For right
+		 * now, out of an abundance of conservatism, we use the same test here
 		 * we did for the heap page; if this results in a dropped bit, no real
 		 * harm is done; and the next VACUUM will fix it.
 		 */
@@ -5183,7 +5181,7 @@ heap_xlog_update(XLogRecPtr lsn, XLogRecord *record, bool hot_update)
 	if (xlrec->all_visible_cleared)
 	{
 		Relation	reln = CreateFakeRelcacheEntry(xlrec->target.node);
-		BlockNumber	block = ItemPointerGetBlockNumber(&xlrec->target.tid);
+		BlockNumber block = ItemPointerGetBlockNumber(&xlrec->target.tid);
 		Buffer		vmbuffer = InvalidBuffer;
 
 		visibilitymap_pin(reln, block, &vmbuffer);
@@ -5267,7 +5265,7 @@ newt:;
 	if (xlrec->new_all_visible_cleared)
 	{
 		Relation	reln = CreateFakeRelcacheEntry(xlrec->target.node);
-		BlockNumber	block = ItemPointerGetBlockNumber(&xlrec->newtid);
+		BlockNumber block = ItemPointerGetBlockNumber(&xlrec->newtid);
 		Buffer		vmbuffer = InvalidBuffer;
 
 		visibilitymap_pin(reln, block, &vmbuffer);
@@ -5690,7 +5688,7 @@ heap2_desc(StringInfo buf, uint8 xl_info, char *rec)
 		else
 			appendStringInfo(buf, "multi-insert: ");
 		appendStringInfo(buf, "rel %u/%u/%u; blk %u; %d tuples",
-						 xlrec->node.spcNode, xlrec->node.dbNode, xlrec->node.relNode,
+				xlrec->node.spcNode, xlrec->node.dbNode, xlrec->node.relNode,
 						 xlrec->blkno, xlrec->ntuples);
 	}
 	else
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 30ef1bf7e0..19a34923c7 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -109,8 +109,8 @@ GetVisibilityMapPins(Relation relation, Buffer buffer1, Buffer buffer2,
 					 BlockNumber block1, BlockNumber block2,
 					 Buffer *vmbuffer1, Buffer *vmbuffer2)
 {
-	bool	need_to_pin_buffer1;
-	bool	need_to_pin_buffer2;
+	bool		need_to_pin_buffer1;
+	bool		need_to_pin_buffer2;
 
 	Assert(BufferIsValid(buffer1));
 	Assert(buffer2 == InvalidBuffer || buffer1 <= buffer2);
@@ -145,7 +145,7 @@ GetVisibilityMapPins(Relation relation, Buffer buffer1, Buffer buffer2,
 		/*
 		 * If there are two buffers involved and we pinned just one of them,
 		 * it's possible that the second one became all-visible while we were
-		 * busy pinning the first one.  If it looks like that's a possible
+		 * busy pinning the first one.	If it looks like that's a possible
 		 * scenario, we'll need to make a second pass through this loop.
 		 */
 		if (buffer2 == InvalidBuffer || buffer1 == buffer2
@@ -302,11 +302,11 @@ RelationGetBufferForTuple(Relation relation, Size len,
 		 * block if one was given, taking suitable care with lock ordering and
 		 * the possibility they are the same block.
 		 *
-		 * If the page-level all-visible flag is set, caller will need to clear
-		 * both that and the corresponding visibility map bit.  However, by the
-		 * time we return, we'll have x-locked the buffer, and we don't want to
-		 * do any I/O while in that state.  So we check the bit here before
-		 * taking the lock, and pin the page if it appears necessary.
+		 * If the page-level all-visible flag is set, caller will need to
+		 * clear both that and the corresponding visibility map bit.  However,
+		 * by the time we return, we'll have x-locked the buffer, and we don't
+		 * want to do any I/O while in that state.	So we check the bit here
+		 * before taking the lock, and pin the page if it appears necessary.
 		 * Checking without the lock creates a risk of getting the wrong
 		 * answer, so we'll have to recheck after acquiring the lock.
 		 */
@@ -347,23 +347,24 @@ RelationGetBufferForTuple(Relation relation, Size len,
 
 		/*
 		 * We now have the target page (and the other buffer, if any) pinned
-		 * and locked.  However, since our initial PageIsAllVisible checks
-		 * were performed before acquiring the lock, the results might now
-		 * be out of date, either for the selected victim buffer, or for the
-		 * other buffer passed by the caller.  In that case, we'll need to give
-		 * up our locks, go get the pin(s) we failed to get earlier, and
+		 * and locked.	However, since our initial PageIsAllVisible checks
+		 * were performed before acquiring the lock, the results might now be
+		 * out of date, either for the selected victim buffer, or for the
+		 * other buffer passed by the caller.  In that case, we'll need to
+		 * give up our locks, go get the pin(s) we failed to get earlier, and
 		 * re-lock.  That's pretty painful, but hopefully shouldn't happen
 		 * often.
 		 *
-		 * Note that there's a small possibility that we didn't pin the
-		 * page above but still have the correct page pinned anyway, either
-		 * because we've already made a previous pass through this loop, or
-		 * because caller passed us the right page anyway.
+		 * Note that there's a small possibility that we didn't pin the page
+		 * above but still have the correct page pinned anyway, either because
+		 * we've already made a previous pass through this loop, or because
+		 * caller passed us the right page anyway.
 		 *
 		 * Note also that it's possible that by the time we get the pin and
 		 * retake the buffer locks, the visibility map bit will have been
-		 * cleared by some other backend anyway.  In that case, we'll have done
-		 * a bit of extra work for no gain, but there's no real harm done.
+		 * cleared by some other backend anyway.  In that case, we'll have
+		 * done a bit of extra work for no gain, but there's no real harm
+		 * done.
 		 */
 		if (otherBuffer == InvalidBuffer || buffer <= otherBuffer)
 			GetVisibilityMapPins(relation, buffer, otherBuffer,
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c
index 28b5a20ae7..050f048a9b 100644
--- a/src/backend/access/heap/tuptoaster.c
+++ b/src/backend/access/heap/tuptoaster.c
@@ -75,7 +75,7 @@ do { \
 
 static void toast_delete_datum(Relation rel, Datum value);
 static Datum toast_save_datum(Relation rel, Datum value,
-				 struct varlena *oldexternal, int options);
+				 struct varlena * oldexternal, int options);
 static bool toastrel_valueid_exists(Relation toastrel, Oid valueid);
 static bool toastid_valueid_exists(Oid toastrelid, Oid valueid);
 static struct varlena *toast_fetch_datum(struct varlena * attr);
@@ -1233,7 +1233,7 @@ toast_compress_datum(Datum value)
  */
 static Datum
 toast_save_datum(Relation rel, Datum value,
-				 struct varlena *oldexternal, int options)
+				 struct varlena * oldexternal, int options)
 {
 	Relation	toastrel;
 	Relation	toastidx;
@@ -1353,7 +1353,7 @@ toast_save_datum(Relation rel, Datum value,
 				 * those versions could easily reference the same toast value.
 				 * When we copy the second or later version of such a row,
 				 * reusing the OID will mean we select an OID that's already
-				 * in the new toast table.  Check for that, and if so, just
+				 * in the new toast table.	Check for that, and if so, just
 				 * fall through without writing the data again.
 				 *
 				 * While annoying and ugly-looking, this is a good thing
diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c
index 9152c7d151..eb5625906f 100644
--- a/src/backend/access/heap/visibilitymap.c
+++ b/src/backend/access/heap/visibilitymap.c
@@ -16,7 +16,7 @@
  *		visibilitymap_pin_ok - check whether correct map page is already pinned
  *		visibilitymap_set	 - set a bit in a previously pinned page
  *		visibilitymap_test	 - test if a bit is set
- *		visibilitymap_count	 - count number of bits set in visibility map
+ *		visibilitymap_count  - count number of bits set in visibility map
  *		visibilitymap_truncate	- truncate the visibility map
  *
  * NOTES
@@ -27,7 +27,7 @@
  * the sense that we make sure that whenever a bit is set, we know the
  * condition is true, but if a bit is not set, it might or might not be true.
  *
- * Clearing a visibility map bit is not separately WAL-logged.  The callers
+ * Clearing a visibility map bit is not separately WAL-logged.	The callers
  * must make sure that whenever a bit is cleared, the bit is cleared on WAL
  * replay of the updating operation as well.
  *
@@ -36,9 +36,9 @@
  * it may still be the case that every tuple on the page is visible to all
  * transactions; we just don't know that for certain.  The difficulty is that
  * there are two bits which are typically set together: the PD_ALL_VISIBLE bit
- * on the page itself, and the visibility map bit.  If a crash occurs after the
+ * on the page itself, and the visibility map bit.	If a crash occurs after the
  * visibility map page makes it to disk and before the updated heap page makes
- * it to disk, redo must set the bit on the heap page.  Otherwise, the next
+ * it to disk, redo must set the bit on the heap page.	Otherwise, the next
  * insert, update, or delete on the heap page will fail to realize that the
  * visibility map bit must be cleared, possibly causing index-only scans to
  * return wrong answers.
@@ -59,10 +59,10 @@
  * the buffer lock over any I/O that may be required to read in the visibility
  * map page.  To avoid this, we examine the heap page before locking it;
  * if the page-level PD_ALL_VISIBLE bit is set, we pin the visibility map
- * bit.  Then, we lock the buffer.  But this creates a race condition: there
+ * bit.  Then, we lock the buffer.	But this creates a race condition: there
  * is a possibility that in the time it takes to lock the buffer, the
  * PD_ALL_VISIBLE bit gets set.  If that happens, we have to unlock the
- * buffer, pin the visibility map page, and relock the buffer.  This shouldn't
+ * buffer, pin the visibility map page, and relock the buffer.	This shouldn't
  * happen often, because only VACUUM currently sets visibility map bits,
  * and the race will only occur if VACUUM processes a given page at almost
  * exactly the same time that someone tries to further modify it.
@@ -227,9 +227,9 @@ visibilitymap_pin_ok(BlockNumber heapBlk, Buffer buf)
  *	visibilitymap_set - set a bit on a previously pinned page
  *
  * recptr is the LSN of the XLOG record we're replaying, if we're in recovery,
- * or InvalidXLogRecPtr in normal running.  The page LSN is advanced to the
+ * or InvalidXLogRecPtr in normal running.	The page LSN is advanced to the
  * one provided; in normal running, we generate a new XLOG record and set the
- * page LSN to that value.  cutoff_xid is the largest xmin on the page being
+ * page LSN to that value.	cutoff_xid is the largest xmin on the page being
  * marked all-visible; it is needed for Hot Standby, and can be
  * InvalidTransactionId if the page contains no tuples.
  *
@@ -295,10 +295,10 @@ visibilitymap_set(Relation rel, BlockNumber heapBlk, XLogRecPtr recptr,
  * releasing *buf after it's done testing and setting bits.
  *
  * NOTE: This function is typically called without a lock on the heap page,
- * so somebody else could change the bit just after we look at it.  In fact,
+ * so somebody else could change the bit just after we look at it.	In fact,
  * since we don't lock the visibility map page either, it's even possible that
  * someone else could have changed the bit just before we look at it, but yet
- * we might see the old value.  It is the caller's responsibility to deal with
+ * we might see the old value.	It is the caller's responsibility to deal with
  * all concurrency issues!
  */
 bool
@@ -344,7 +344,7 @@ visibilitymap_test(Relation rel, BlockNumber heapBlk, Buffer *buf)
 }
 
 /*
- *	visibilitymap_count	 - count number of bits set in visibility map
+ *	visibilitymap_count  - count number of bits set in visibility map
  *
  * Note: we ignore the possibility of race conditions when the table is being
  * extended concurrently with the call.  New pages added to the table aren't
@@ -356,16 +356,16 @@ visibilitymap_count(Relation rel)
 	BlockNumber result = 0;
 	BlockNumber mapBlock;
 
-	for (mapBlock = 0; ; mapBlock++)
+	for (mapBlock = 0;; mapBlock++)
 	{
 		Buffer		mapBuffer;
 		unsigned char *map;
 		int			i;
 
 		/*
-		 * Read till we fall off the end of the map.  We assume that any
-		 * extra bytes in the last page are zeroed, so we don't bother
-		 * excluding them from the count.
+		 * Read till we fall off the end of the map.  We assume that any extra
+		 * bytes in the last page are zeroed, so we don't bother excluding
+		 * them from the count.
 		 */
 		mapBuffer = vm_readbuf(rel, mapBlock, false);
 		if (!BufferIsValid(mapBuffer))
@@ -496,11 +496,11 @@ vm_readbuf(Relation rel, BlockNumber blkno, bool extend)
 	Buffer		buf;
 
 	/*
-	 * We might not have opened the relation at the smgr level yet, or we might
-	 * have been forced to close it by a sinval message.  The code below won't
-	 * necessarily notice relation extension immediately when extend = false,
-	 * so we rely on sinval messages to ensure that our ideas about the size of
-	 * the map aren't too far out of date.
+	 * We might not have opened the relation at the smgr level yet, or we
+	 * might have been forced to close it by a sinval message.	The code below
+	 * won't necessarily notice relation extension immediately when extend =
+	 * false, so we rely on sinval messages to ensure that our ideas about the
+	 * size of the map aren't too far out of date.
 	 */
 	RelationOpenSmgr(rel);
 
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index d54b669bf3..26fd9b6e11 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -93,7 +93,7 @@ RelationGetIndexScan(Relation indexRelation, int nkeys, int norderbys)
 	else
 		scan->orderByData = NULL;
 
-	scan->xs_want_itup = false;			/* may be set later */
+	scan->xs_want_itup = false; /* may be set later */
 
 	/*
 	 * During recovery we ignore killed tuples and don't bother to kill them
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 16ac4e1b9f..d64df319c5 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -435,7 +435,7 @@ index_restrpos(IndexScanDesc scan)
 ItemPointer
 index_getnext_tid(IndexScanDesc scan, ScanDirection direction)
 {
-	FmgrInfo   	*procedure;
+	FmgrInfo   *procedure;
 	bool		found;
 
 	SCAN_CHECKS;
@@ -495,7 +495,7 @@ index_getnext_tid(IndexScanDesc scan, ScanDirection direction)
 HeapTuple
 index_fetch_heap(IndexScanDesc scan)
 {
-	ItemPointer	tid = &scan->xs_ctup.t_self;
+	ItemPointer tid = &scan->xs_ctup.t_self;
 	bool		all_dead = false;
 	bool		got_heap_tuple;
 
@@ -530,8 +530,8 @@ index_fetch_heap(IndexScanDesc scan)
 	if (got_heap_tuple)
 	{
 		/*
-		 * Only in a non-MVCC snapshot can more than one member of the
-		 * HOT chain be visible.
+		 * Only in a non-MVCC snapshot can more than one member of the HOT
+		 * chain be visible.
 		 */
 		scan->xs_continue_hot = !IsMVCCSnapshot(scan->xs_snapshot);
 		pgstat_count_heap_fetch(scan->indexRelation);
@@ -544,7 +544,7 @@ index_fetch_heap(IndexScanDesc scan)
 	/*
 	 * If we scanned a whole HOT chain and found only dead tuples, tell index
 	 * AM to kill its entry for that TID (this will take effect in the next
-	 * amgettuple call, in index_getnext_tid).  We do not do this when in
+	 * amgettuple call, in index_getnext_tid).	We do not do this when in
 	 * recovery because it may violate MVCC to do so.  See comments in
 	 * RelationGetIndexScan().
 	 */
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index fedde934a3..d610bef798 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -82,7 +82,7 @@ btint2fastcmp(Datum x, Datum y, SortSupport ssup)
 Datum
 btint2sortsupport(PG_FUNCTION_ARGS)
 {
-	SortSupport	ssup = (SortSupport) PG_GETARG_POINTER(0);
+	SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0);
 
 	ssup->comparator = btint2fastcmp;
 	PG_RETURN_VOID();
@@ -119,7 +119,7 @@ btint4fastcmp(Datum x, Datum y, SortSupport ssup)
 Datum
 btint4sortsupport(PG_FUNCTION_ARGS)
 {
-	SortSupport	ssup = (SortSupport) PG_GETARG_POINTER(0);
+	SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0);
 
 	ssup->comparator = btint4fastcmp;
 	PG_RETURN_VOID();
@@ -156,7 +156,7 @@ btint8fastcmp(Datum x, Datum y, SortSupport ssup)
 Datum
 btint8sortsupport(PG_FUNCTION_ARGS)
 {
-	SortSupport	ssup = (SortSupport) PG_GETARG_POINTER(0);
+	SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0);
 
 	ssup->comparator = btint8fastcmp;
 	PG_RETURN_VOID();
@@ -277,7 +277,7 @@ btoidfastcmp(Datum x, Datum y, SortSupport ssup)
 Datum
 btoidsortsupport(PG_FUNCTION_ARGS)
 {
-	SortSupport	ssup = (SortSupport) PG_GETARG_POINTER(0);
+	SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0);
 
 	ssup->comparator = btoidfastcmp;
 	PG_RETURN_VOID();
@@ -338,7 +338,7 @@ btnamefastcmp(Datum x, Datum y, SortSupport ssup)
 Datum
 btnamesortsupport(PG_FUNCTION_ARGS)
 {
-	SortSupport	ssup = (SortSupport) PG_GETARG_POINTER(0);
+	SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0);
 
 	ssup->comparator = btnamefastcmp;
 	PG_RETURN_VOID();
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index e6dec618c7..016ce2283c 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -1362,7 +1362,7 @@ _bt_pagedel(Relation rel, Buffer buf, BTStack stack)
 	 * we're in VACUUM and would not otherwise have an XID.  Having already
 	 * updated links to the target, ReadNewTransactionId() suffices as an
 	 * upper bound.  Any scan having retained a now-stale link is advertising
-	 * in its PGXACT an xmin less than or equal to the value we read here.  It
+	 * in its PGXACT an xmin less than or equal to the value we read here.	It
 	 * will continue to do so, holding back RecentGlobalXmin, for the duration
 	 * of that scan.
 	 */
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 184fc3bb79..41d06edb15 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -433,7 +433,7 @@ btbeginscan(PG_FUNCTION_ARGS)
 
 	/*
 	 * We don't know yet whether the scan will be index-only, so we do not
-	 * allocate the tuple workspace arrays until btrescan.  However, we set up
+	 * allocate the tuple workspace arrays until btrescan.	However, we set up
 	 * scan->xs_itupdesc whether we'll need it or not, since that's so cheap.
 	 */
 	so->currTuples = so->markTuples = NULL;
@@ -478,7 +478,7 @@ btrescan(PG_FUNCTION_ARGS)
 
 	/*
 	 * Allocate tuple workspace arrays, if needed for an index-only scan and
-	 * not already done in a previous rescan call.  To save on palloc
+	 * not already done in a previous rescan call.	To save on palloc
 	 * overhead, both workspaces are allocated as one palloc block; only this
 	 * function and btendscan know that.
 	 *
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index b701c3f819..e0c952368b 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -564,11 +564,11 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 					ScanKeyEntryInitialize(chosen,
 										   (SK_SEARCHNOTNULL | SK_ISNULL |
 											(impliesNN->sk_flags &
-											 (SK_BT_DESC | SK_BT_NULLS_FIRST))),
+										  (SK_BT_DESC | SK_BT_NULLS_FIRST))),
 										   curattr,
-										   ((impliesNN->sk_flags & SK_BT_NULLS_FIRST) ?
-											BTGreaterStrategyNumber :
-											BTLessStrategyNumber),
+								 ((impliesNN->sk_flags & SK_BT_NULLS_FIRST) ?
+								  BTGreaterStrategyNumber :
+								  BTLessStrategyNumber),
 										   InvalidOid,
 										   InvalidOid,
 										   InvalidOid,
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index f79ce552b6..33ad8915f5 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -37,10 +37,10 @@ typedef struct BTSortArrayContext
 static Datum _bt_find_extreme_element(IndexScanDesc scan, ScanKey skey,
 						 StrategyNumber strat,
 						 Datum *elems, int nelems);
-static int	_bt_sort_array_elements(IndexScanDesc scan, ScanKey skey,
+static int _bt_sort_array_elements(IndexScanDesc scan, ScanKey skey,
 						bool reverse,
 						Datum *elems, int nelems);
-static int _bt_compare_array_elements(const void *a, const void *b, void *arg);
+static int	_bt_compare_array_elements(const void *a, const void *b, void *arg);
 static bool _bt_compare_scankey_args(IndexScanDesc scan, ScanKey op,
 						 ScanKey leftarg, ScanKey rightarg,
 						 bool *result);
@@ -227,8 +227,8 @@ _bt_preprocess_array_keys(IndexScanDesc scan)
 	}
 
 	/*
-	 * Make a scan-lifespan context to hold array-associated data, or reset
-	 * it if we already have one from a previous rescan cycle.
+	 * Make a scan-lifespan context to hold array-associated data, or reset it
+	 * if we already have one from a previous rescan cycle.
 	 */
 	if (so->arrayContext == NULL)
 		so->arrayContext = AllocSetContextCreate(CurrentMemoryContext,
@@ -269,7 +269,7 @@ _bt_preprocess_array_keys(IndexScanDesc scan)
 			continue;
 
 		/*
-		 * First, deconstruct the array into elements.  Anything allocated
+		 * First, deconstruct the array into elements.	Anything allocated
 		 * here (including a possibly detoasted array value) is in the
 		 * workspace context.
 		 */
@@ -283,7 +283,7 @@ _bt_preprocess_array_keys(IndexScanDesc scan)
 						  &elem_values, &elem_nulls, &num_elems);
 
 		/*
-		 * Compress out any null elements.  We can ignore them since we assume
+		 * Compress out any null elements.	We can ignore them since we assume
 		 * all btree operators are strict.
 		 */
 		num_nonnulls = 0;
@@ -338,7 +338,7 @@ _bt_preprocess_array_keys(IndexScanDesc scan)
 		 * successive primitive indexscans produce data in index order.
 		 */
 		num_elems = _bt_sort_array_elements(scan, cur,
-											(indoption[cur->sk_attno - 1] & INDOPTION_DESC) != 0,
+						(indoption[cur->sk_attno - 1] & INDOPTION_DESC) != 0,
 											elem_values, num_nonnulls);
 
 		/*
@@ -387,9 +387,10 @@ _bt_find_extreme_element(IndexScanDesc scan, ScanKey skey,
 	/*
 	 * Look up the appropriate comparison operator in the opfamily.
 	 *
-	 * Note: it's possible that this would fail, if the opfamily is incomplete,
-	 * but it seems quite unlikely that an opfamily would omit non-cross-type
-	 * comparison operators for any datatype that it supports at all.
+	 * Note: it's possible that this would fail, if the opfamily is
+	 * incomplete, but it seems quite unlikely that an opfamily would omit
+	 * non-cross-type comparison operators for any datatype that it supports
+	 * at all.
 	 */
 	cmp_op = get_opfamily_member(rel->rd_opfamily[skey->sk_attno - 1],
 								 elemtype,
@@ -455,9 +456,10 @@ _bt_sort_array_elements(IndexScanDesc scan, ScanKey skey,
 	/*
 	 * Look up the appropriate comparison function in the opfamily.
 	 *
-	 * Note: it's possible that this would fail, if the opfamily is incomplete,
-	 * but it seems quite unlikely that an opfamily would omit non-cross-type
-	 * support functions for any datatype that it supports at all.
+	 * Note: it's possible that this would fail, if the opfamily is
+	 * incomplete, but it seems quite unlikely that an opfamily would omit
+	 * non-cross-type support functions for any datatype that it supports at
+	 * all.
 	 */
 	cmp_proc = get_opfamily_proc(rel->rd_opfamily[skey->sk_attno - 1],
 								 elemtype,
@@ -515,7 +517,7 @@ _bt_compare_array_elements(const void *a, const void *b, void *arg)
  * _bt_start_array_keys() -- Initialize array keys at start of a scan
  *
  * Set up the cur_elem counters and fill in the first sk_argument value for
- * each array scankey.  We can't do this until we know the scan direction.
+ * each array scankey.	We can't do this until we know the scan direction.
  */
 void
 _bt_start_array_keys(IndexScanDesc scan, ScanDirection dir)
@@ -609,8 +611,8 @@ _bt_advance_array_keys(IndexScanDesc scan, ScanDirection dir)
  * so that the index sorts in the desired direction.
  *
  * One key purpose of this routine is to discover which scan keys must be
- * satisfied to continue the scan.  It also attempts to eliminate redundant
- * keys and detect contradictory keys.  (If the index opfamily provides
+ * satisfied to continue the scan.	It also attempts to eliminate redundant
+ * keys and detect contradictory keys.	(If the index opfamily provides
  * incomplete sets of cross-type operators, we may fail to detect redundant
  * or contradictory keys, but we can survive that.)
  *
@@ -676,7 +678,7 @@ _bt_advance_array_keys(IndexScanDesc scan, ScanDirection dir)
  * Note: the reason we have to copy the preprocessed scan keys into private
  * storage is that we are modifying the array based on comparisons of the
  * key argument values, which could change on a rescan or after moving to
- * new elements of array keys.  Therefore we can't overwrite the source data.
+ * new elements of array keys.	Therefore we can't overwrite the source data.
  */
 void
 _bt_preprocess_keys(IndexScanDesc scan)
@@ -781,8 +783,8 @@ _bt_preprocess_keys(IndexScanDesc scan)
 			 * set qual_ok to false and abandon further processing.
 			 *
 			 * We also have to deal with the case of "key IS NULL", which is
-			 * unsatisfiable in combination with any other index condition.
-			 * By the time we get here, that's been classified as an equality
+			 * unsatisfiable in combination with any other index condition. By
+			 * the time we get here, that's been classified as an equality
 			 * check, and we've rejected any combination of it with a regular
 			 * equality condition; but not with other types of conditions.
 			 */
@@ -1421,12 +1423,12 @@ _bt_checkkeys(IndexScanDesc scan,
 				/*
 				 * Since NULLs are sorted before non-NULLs, we know we have
 				 * reached the lower limit of the range of values for this
-				 * index attr.  On a backward scan, we can stop if this qual
+				 * index attr.	On a backward scan, we can stop if this qual
 				 * is one of the "must match" subset.  We can stop regardless
 				 * of whether the qual is > or <, so long as it's required,
-				 * because it's not possible for any future tuples to pass.
-				 * On a forward scan, however, we must keep going, because we
-				 * may have initially positioned to the start of the index.
+				 * because it's not possible for any future tuples to pass. On
+				 * a forward scan, however, we must keep going, because we may
+				 * have initially positioned to the start of the index.
 				 */
 				if ((key->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)) &&
 					ScanDirectionIsBackward(dir))
@@ -1437,11 +1439,11 @@ _bt_checkkeys(IndexScanDesc scan,
 				/*
 				 * Since NULLs are sorted after non-NULLs, we know we have
 				 * reached the upper limit of the range of values for this
-				 * index attr.  On a forward scan, we can stop if this qual is
-				 * one of the "must match" subset.  We can stop regardless of
+				 * index attr.	On a forward scan, we can stop if this qual is
+				 * one of the "must match" subset.	We can stop regardless of
 				 * whether the qual is > or <, so long as it's required,
-				 * because it's not possible for any future tuples to pass.
-				 * On a backward scan, however, we must keep going, because we
+				 * because it's not possible for any future tuples to pass. On
+				 * a backward scan, however, we must keep going, because we
 				 * may have initially positioned to the end of the index.
 				 */
 				if ((key->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)) &&
@@ -1532,12 +1534,12 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, TupleDesc tupdesc,
 				/*
 				 * Since NULLs are sorted before non-NULLs, we know we have
 				 * reached the lower limit of the range of values for this
-				 * index attr.  On a backward scan, we can stop if this qual
+				 * index attr.	On a backward scan, we can stop if this qual
 				 * is one of the "must match" subset.  We can stop regardless
 				 * of whether the qual is > or <, so long as it's required,
-				 * because it's not possible for any future tuples to pass.
-				 * On a forward scan, however, we must keep going, because we
-				 * may have initially positioned to the start of the index.
+				 * because it's not possible for any future tuples to pass. On
+				 * a forward scan, however, we must keep going, because we may
+				 * have initially positioned to the start of the index.
 				 */
 				if ((subkey->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)) &&
 					ScanDirectionIsBackward(dir))
@@ -1548,11 +1550,11 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, TupleDesc tupdesc,
 				/*
 				 * Since NULLs are sorted after non-NULLs, we know we have
 				 * reached the upper limit of the range of values for this
-				 * index attr.  On a forward scan, we can stop if this qual is
-				 * one of the "must match" subset.  We can stop regardless of
+				 * index attr.	On a forward scan, we can stop if this qual is
+				 * one of the "must match" subset.	We can stop regardless of
 				 * whether the qual is > or <, so long as it's required,
-				 * because it's not possible for any future tuples to pass.
-				 * On a backward scan, however, we must keep going, because we
+				 * because it's not possible for any future tuples to pass. On
+				 * a backward scan, however, we must keep going, because we
 				 * may have initially positioned to the end of the index.
 				 */
 				if ((subkey->sk_flags & (SK_BT_REQFWD | SK_BT_REQBKWD)) &&
diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c
index 98a7bea742..b3f8f6a231 100644
--- a/src/backend/access/spgist/spgdoinsert.c
+++ b/src/backend/access/spgist/spgdoinsert.c
@@ -24,7 +24,7 @@
 /*
  * SPPageDesc tracks all info about a page we are inserting into.  In some
  * situations it actually identifies a tuple, or even a specific node within
- * an inner tuple.  But any of the fields can be invalid.  If the buffer
+ * an inner tuple.	But any of the fields can be invalid.  If the buffer
  * field is valid, it implies we hold pin and exclusive lock on that buffer.
  * page pointer should be valid exactly when buffer is.
  */
@@ -129,8 +129,8 @@ spgPageIndexMultiDelete(SpGistState *state, Page page,
 						int firststate, int reststate,
 						BlockNumber blkno, OffsetNumber offnum)
 {
-	OffsetNumber	firstItem;
-	OffsetNumber   *sortednos;
+	OffsetNumber firstItem;
+	OffsetNumber *sortednos;
 	SpGistDeadTuple tuple = NULL;
 	int			i;
 
@@ -155,8 +155,8 @@ spgPageIndexMultiDelete(SpGistState *state, Page page,
 
 	for (i = 0; i < nitems; i++)
 	{
-		OffsetNumber	itemno = sortednos[i];
-		int				tupstate;
+		OffsetNumber itemno = sortednos[i];
+		int			tupstate;
 
 		tupstate = (itemno == firstItem) ? firststate : reststate;
 		if (tuple == NULL || tuple->tupstate != tupstate)
@@ -200,7 +200,7 @@ saveNodeLink(Relation index, SPPageDesc *parent,
  */
 static void
 addLeafTuple(Relation index, SpGistState *state, SpGistLeafTuple leafTuple,
-			 SPPageDesc *current, SPPageDesc *parent, bool isNulls, bool isNew)
+		   SPPageDesc *current, SPPageDesc *parent, bool isNulls, bool isNew)
 {
 	XLogRecData rdata[4];
 	spgxlogAddLeaf xlrec;
@@ -230,7 +230,7 @@ addLeafTuple(Relation index, SpGistState *state, SpGistLeafTuple leafTuple,
 		/* Tuple is not part of a chain */
 		leafTuple->nextOffset = InvalidOffsetNumber;
 		current->offnum = SpGistPageAddNewItem(state, current->page,
-											   (Item) leafTuple, leafTuple->size,
+										   (Item) leafTuple, leafTuple->size,
 											   NULL, false);
 
 		xlrec.offnumLeaf = current->offnum;
@@ -250,9 +250,9 @@ addLeafTuple(Relation index, SpGistState *state, SpGistLeafTuple leafTuple,
 	else
 	{
 		/*
-		 * Tuple must be inserted into existing chain.  We mustn't change
-		 * the chain's head address, but we don't need to chase the entire
-		 * chain to put the tuple at the end; we can insert it second.
+		 * Tuple must be inserted into existing chain.	We mustn't change the
+		 * chain's head address, but we don't need to chase the entire chain
+		 * to put the tuple at the end; we can insert it second.
 		 *
 		 * Also, it's possible that the "chain" consists only of a DEAD tuple,
 		 * in which case we should replace the DEAD tuple in-place.
@@ -261,7 +261,7 @@ addLeafTuple(Relation index, SpGistState *state, SpGistLeafTuple leafTuple,
 		OffsetNumber offnum;
 
 		head = (SpGistLeafTuple) PageGetItem(current->page,
-											 PageGetItemId(current->page, current->offnum));
+							  PageGetItemId(current->page, current->offnum));
 		if (head->tupstate == SPGIST_LIVE)
 		{
 			leafTuple->nextOffset = head->nextOffset;
@@ -274,7 +274,7 @@ addLeafTuple(Relation index, SpGistState *state, SpGistLeafTuple leafTuple,
 			 * and set new second element
 			 */
 			head = (SpGistLeafTuple) PageGetItem(current->page,
-											 PageGetItemId(current->page, current->offnum));
+							  PageGetItemId(current->page, current->offnum));
 			head->nextOffset = offnum;
 
 			xlrec.offnumLeaf = offnum;
@@ -483,7 +483,7 @@ moveLeafs(Relation index, SpGistState *state,
 		for (i = 0; i < nDelete; i++)
 		{
 			it = (SpGistLeafTuple) PageGetItem(current->page,
-											   PageGetItemId(current->page, toDelete[i]));
+								  PageGetItemId(current->page, toDelete[i]));
 			Assert(it->tupstate == SPGIST_LIVE);
 
 			/*
@@ -516,12 +516,12 @@ moveLeafs(Relation index, SpGistState *state,
 	leafptr += newLeafTuple->size;
 
 	/*
-	 * Now delete the old tuples, leaving a redirection pointer behind for
-	 * the first one, unless we're doing an index build; in which case there
-	 * can't be any concurrent scan so we need not provide a redirect.
+	 * Now delete the old tuples, leaving a redirection pointer behind for the
+	 * first one, unless we're doing an index build; in which case there can't
+	 * be any concurrent scan so we need not provide a redirect.
 	 */
 	spgPageIndexMultiDelete(state, current->page, toDelete, nDelete,
-							state->isBuild ? SPGIST_PLACEHOLDER : SPGIST_REDIRECT,
+					   state->isBuild ? SPGIST_PLACEHOLDER : SPGIST_REDIRECT,
 							SPGIST_PLACEHOLDER,
 							nblkno, r);
 
@@ -575,7 +575,7 @@ setRedirectionTuple(SPPageDesc *current, OffsetNumber position,
 	SpGistDeadTuple dt;
 
 	dt = (SpGistDeadTuple) PageGetItem(current->page,
-									   PageGetItemId(current->page, position));
+									 PageGetItemId(current->page, position));
 	Assert(dt->tupstate == SPGIST_REDIRECT);
 	Assert(ItemPointerGetBlockNumber(&dt->pointer) == SPGIST_METAPAGE_BLKNO);
 	ItemPointerSet(&dt->pointer, blkno, offnum);
@@ -640,7 +640,7 @@ checkAllTheSame(spgPickSplitIn *in, spgPickSplitOut *out, bool tooBig,
 	/* The opclass may not use node labels, but if it does, duplicate 'em */
 	if (out->nodeLabels)
 	{
-		Datum	theLabel = out->nodeLabels[theNode];
+		Datum		theLabel = out->nodeLabels[theNode];
 
 		out->nodeLabels = (Datum *) palloc(sizeof(Datum) * out->nNodes);
 		for (i = 0; i < out->nNodes; i++)
@@ -754,8 +754,8 @@ doPickSplit(Relation index, SpGistState *state,
 	{
 		/*
 		 * We are splitting the root (which up to now is also a leaf page).
-		 * Its tuples are not linked, so scan sequentially to get them all.
-		 * We ignore the original value of current->offnum.
+		 * Its tuples are not linked, so scan sequentially to get them all. We
+		 * ignore the original value of current->offnum.
 		 */
 		for (i = FirstOffsetNumber; i <= max; i++)
 		{
@@ -773,7 +773,7 @@ doPickSplit(Relation index, SpGistState *state,
 				/* we will delete the tuple altogether, so count full space */
 				spaceToDelete += it->size + sizeof(ItemIdData);
 			}
-			else				/* tuples on root should be live */
+			else	/* tuples on root should be live */
 				elog(ERROR, "unexpected SPGiST tuple state: %d", it->tupstate);
 		}
 	}
@@ -820,7 +820,7 @@ doPickSplit(Relation index, SpGistState *state,
 	 * We may not actually insert new tuple because another picksplit may be
 	 * necessary due to too large value, but we will try to allocate enough
 	 * space to include it; and in any case it has to be included in the input
-	 * for the picksplit function.  So don't increment nToInsert yet.
+	 * for the picksplit function.	So don't increment nToInsert yet.
 	 */
 	in.datums[in.nTuples] = SGLTDATUM(newLeafTuple, state);
 	heapPtrs[in.nTuples] = newLeafTuple->heapPtr;
@@ -878,7 +878,7 @@ doPickSplit(Relation index, SpGistState *state,
 	/*
 	 * Check to see if the picksplit function failed to separate the values,
 	 * ie, it put them all into the same child node.  If so, select allTheSame
-	 * mode and create a random split instead.  See comments for
+	 * mode and create a random split instead.	See comments for
 	 * checkAllTheSame as to why we need to know if the new leaf tuples could
 	 * fit on one page.
 	 */
@@ -924,8 +924,8 @@ doPickSplit(Relation index, SpGistState *state,
 	innerTuple->allTheSame = allTheSame;
 
 	/*
-	 * Update nodes[] array to point into the newly formed innerTuple, so
-	 * that we can adjust their downlinks below.
+	 * Update nodes[] array to point into the newly formed innerTuple, so that
+	 * we can adjust their downlinks below.
 	 */
 	SGITITERATE(innerTuple, i, node)
 	{
@@ -944,13 +944,13 @@ doPickSplit(Relation index, SpGistState *state,
 	}
 
 	/*
-	 * To perform the split, we must insert a new inner tuple, which can't
-	 * go on a leaf page; and unless we are splitting the root page, we
-	 * must then update the parent tuple's downlink to point to the inner
-	 * tuple.  If there is room, we'll put the new inner tuple on the same
-	 * page as the parent tuple, otherwise we need another non-leaf buffer.
-	 * But if the parent page is the root, we can't add the new inner tuple
-	 * there, because the root page must have only one inner tuple.
+	 * To perform the split, we must insert a new inner tuple, which can't go
+	 * on a leaf page; and unless we are splitting the root page, we must then
+	 * update the parent tuple's downlink to point to the inner tuple.  If
+	 * there is room, we'll put the new inner tuple on the same page as the
+	 * parent tuple, otherwise we need another non-leaf buffer. But if the
+	 * parent page is the root, we can't add the new inner tuple there,
+	 * because the root page must have only one inner tuple.
 	 */
 	xlrec.initInner = false;
 	if (parent->buffer != InvalidBuffer &&
@@ -965,9 +965,9 @@ doPickSplit(Relation index, SpGistState *state,
 	{
 		/* Send tuple to page with next triple parity (see README) */
 		newInnerBuffer = SpGistGetBuffer(index,
-										 GBUF_INNER_PARITY(parent->blkno + 1) |
+									   GBUF_INNER_PARITY(parent->blkno + 1) |
 										 (isNulls ? GBUF_NULLS : 0),
-										 innerTuple->size + sizeof(ItemIdData),
+									   innerTuple->size + sizeof(ItemIdData),
 										 &xlrec.initInner);
 	}
 	else
@@ -977,22 +977,22 @@ doPickSplit(Relation index, SpGistState *state,
 	}
 
 	/*
-	 * Because a WAL record can't involve more than four buffers, we can
-	 * only afford to deal with two leaf pages in each picksplit action,
-	 * ie the current page and at most one other.
+	 * Because a WAL record can't involve more than four buffers, we can only
+	 * afford to deal with two leaf pages in each picksplit action, ie the
+	 * current page and at most one other.
 	 *
-	 * The new leaf tuples converted from the existing ones should require
-	 * the same or less space, and therefore should all fit onto one page
+	 * The new leaf tuples converted from the existing ones should require the
+	 * same or less space, and therefore should all fit onto one page
 	 * (although that's not necessarily the current page, since we can't
 	 * delete the old tuples but only replace them with placeholders).
-	 * However, the incoming new tuple might not also fit, in which case
-	 * we might need another picksplit cycle to reduce it some more.
+	 * However, the incoming new tuple might not also fit, in which case we
+	 * might need another picksplit cycle to reduce it some more.
 	 *
-	 * If there's not room to put everything back onto the current page,
-	 * then we decide on a per-node basis which tuples go to the new page.
-	 * (We do it like that because leaf tuple chains can't cross pages,
-	 * so we must place all leaf tuples belonging to the same parent node
-	 * on the same page.)
+	 * If there's not room to put everything back onto the current page, then
+	 * we decide on a per-node basis which tuples go to the new page. (We do
+	 * it like that because leaf tuple chains can't cross pages, so we must
+	 * place all leaf tuples belonging to the same parent node on the same
+	 * page.)
 	 *
 	 * If we are splitting the root page (turning it from a leaf page into an
 	 * inner page), then no leaf tuples can go back to the current page; they
@@ -1037,12 +1037,13 @@ doPickSplit(Relation index, SpGistState *state,
 		int			newspace;
 
 		newLeafBuffer = SpGistGetBuffer(index,
-										GBUF_LEAF | (isNulls ? GBUF_NULLS : 0),
+									  GBUF_LEAF | (isNulls ? GBUF_NULLS : 0),
 										Min(totalLeafSizes,
 											SPGIST_PAGE_CAPACITY),
 										&xlrec.initDest);
+
 		/*
-		 * Attempt to assign node groups to the two pages.  We might fail to
+		 * Attempt to assign node groups to the two pages.	We might fail to
 		 * do so, even if totalLeafSizes is less than the available space,
 		 * because we can't split a group across pages.
 		 */
@@ -1054,12 +1055,12 @@ doPickSplit(Relation index, SpGistState *state,
 		{
 			if (leafSizes[i] <= curspace)
 			{
-				nodePageSelect[i] = 0; /* signifies current page */
+				nodePageSelect[i] = 0;	/* signifies current page */
 				curspace -= leafSizes[i];
 			}
 			else
 			{
-				nodePageSelect[i] = 1; /* signifies new leaf page */
+				nodePageSelect[i] = 1;	/* signifies new leaf page */
 				newspace -= leafSizes[i];
 			}
 		}
@@ -1075,7 +1076,7 @@ doPickSplit(Relation index, SpGistState *state,
 		else if (includeNew)
 		{
 			/* We must exclude the new leaf tuple from the split */
-			int		nodeOfNewTuple = out.mapTuplesToNodes[in.nTuples - 1];
+			int			nodeOfNewTuple = out.mapTuplesToNodes[in.nTuples - 1];
 
 			leafSizes[nodeOfNewTuple] -=
 				newLeafs[in.nTuples - 1]->size + sizeof(ItemIdData);
@@ -1087,12 +1088,12 @@ doPickSplit(Relation index, SpGistState *state,
 			{
 				if (leafSizes[i] <= curspace)
 				{
-					nodePageSelect[i] = 0; /* signifies current page */
+					nodePageSelect[i] = 0;		/* signifies current page */
 					curspace -= leafSizes[i];
 				}
 				else
 				{
-					nodePageSelect[i] = 1; /* signifies new leaf page */
+					nodePageSelect[i] = 1;		/* signifies new leaf page */
 					newspace -= leafSizes[i];
 				}
 			}
@@ -1204,7 +1205,7 @@ doPickSplit(Relation index, SpGistState *state,
 	for (i = 0; i < nToInsert; i++)
 	{
 		SpGistLeafTuple it = newLeafs[i];
-		Buffer	leafBuffer;
+		Buffer		leafBuffer;
 		BlockNumber leafBlock;
 		OffsetNumber newoffset;
 
@@ -1584,12 +1585,12 @@ spgAddNodeAction(Relation index, SpGistState *state,
 		xlrec.nodeI = parent->node;
 
 		/*
-		 * obtain new buffer with the same parity as current, since it will
-		 * be a child of same parent tuple
+		 * obtain new buffer with the same parity as current, since it will be
+		 * a child of same parent tuple
 		 */
 		current->buffer = SpGistGetBuffer(index,
 										  GBUF_INNER_PARITY(current->blkno),
-										  newInnerTuple->size + sizeof(ItemIdData),
+									newInnerTuple->size + sizeof(ItemIdData),
 										  &xlrec.newPage);
 		current->blkno = BufferGetBlockNumber(current->buffer);
 		current->page = BufferGetPage(current->buffer);
@@ -1597,15 +1598,15 @@ spgAddNodeAction(Relation index, SpGistState *state,
 		xlrec.blknoNew = current->blkno;
 
 		/*
-		 * Let's just make real sure new current isn't same as old.  Right
-		 * now that's impossible, but if SpGistGetBuffer ever got smart enough
-		 * to delete placeholder tuples before checking space, maybe it
-		 * wouldn't be impossible.  The case would appear to work except that
-		 * WAL replay would be subtly wrong, so I think a mere assert isn't
-		 * enough here.
+		 * Let's just make real sure new current isn't same as old.  Right now
+		 * that's impossible, but if SpGistGetBuffer ever got smart enough to
+		 * delete placeholder tuples before checking space, maybe it wouldn't
+		 * be impossible.  The case would appear to work except that WAL
+		 * replay would be subtly wrong, so I think a mere assert isn't enough
+		 * here.
 		 */
-		 if (xlrec.blknoNew == xlrec.blkno)
-			 elog(ERROR, "SPGiST new buffer shouldn't be same as old buffer");
+		if (xlrec.blknoNew == xlrec.blkno)
+			elog(ERROR, "SPGiST new buffer shouldn't be same as old buffer");
 
 		/*
 		 * New current and parent buffer will both be modified; but note that
@@ -1707,9 +1708,9 @@ spgSplitNodeAction(Relation index, SpGistState *state,
 	Assert(!SpGistPageStoresNulls(current->page));
 
 	/*
-	 * Construct new prefix tuple, containing a single node with the
-	 * specified label.  (We'll update the node's downlink to point to the
-	 * new postfix tuple, below.)
+	 * Construct new prefix tuple, containing a single node with the specified
+	 * label.  (We'll update the node's downlink to point to the new postfix
+	 * tuple, below.)
 	 */
 	node = spgFormNodeTuple(state, out->result.splitTuple.nodeLabel, false);
 
@@ -1888,9 +1889,9 @@ spgdoinsert(Relation index, SpGistState *state,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 			errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
 				   (unsigned long) (leafSize - sizeof(ItemIdData)),
-				   (unsigned long) (SPGIST_PAGE_CAPACITY - sizeof(ItemIdData)),
+				 (unsigned long) (SPGIST_PAGE_CAPACITY - sizeof(ItemIdData)),
 				   RelationGetRelationName(index)),
-		  errhint("Values larger than a buffer page cannot be indexed.")));
+			errhint("Values larger than a buffer page cannot be indexed.")));
 
 	/* Initialize "current" to the appropriate root page */
 	current.blkno = isnull ? SPGIST_NULL_BLKNO : SPGIST_ROOT_BLKNO;
@@ -1920,7 +1921,7 @@ spgdoinsert(Relation index, SpGistState *state,
 		if (current.blkno == InvalidBlockNumber)
 		{
 			/*
-			 * Create a leaf page.  If leafSize is too large to fit on a page,
+			 * Create a leaf page.	If leafSize is too large to fit on a page,
 			 * we won't actually use the page yet, but it simplifies the API
 			 * for doPickSplit to always have a leaf page at hand; so just
 			 * quietly limit our request to a page size.
@@ -1968,7 +1969,7 @@ spgdoinsert(Relation index, SpGistState *state,
 			}
 			else if ((sizeToSplit =
 					  checkSplitConditions(index, state, &current,
-										   &nToSplit)) < SPGIST_PAGE_CAPACITY / 2 &&
+