pgindent run for 9.4

This includes removing tabs after periods in C comments, which was
applied to back branches, so this change should not effect backpatching.

Author: bmomjian

config/test_quiet_include.h

@@ -2,4 +2,8 @@
  * For the raison d'etre of this file, check the comment above the definition
  * of the PGAC_C_INLINE macro in config/c-compiler.m4.
  */
-static inline int fun () { return 0; }
+static inline int
+fun()
+{
+	return 0;
+}

contrib/auto_explain/auto_explain.c

@@ -116,7 +116,7 @@ _PG_init(void)
 
 	DefineCustomBoolVariable("auto_explain.log_triggers",
 							 "Include trigger statistics in plans.",
-							 "This has no effect unless log_analyze is also set.",
+						"This has no effect unless log_analyze is also set.",
 							 &auto_explain_log_triggers,
 							 false,
 							 PGC_SUSET,

contrib/btree_gist/btree_interval.c

@@ -86,7 +86,7 @@ gbt_intv_dist(const void *a, const void *b)
 
 /*
  * INTERVALSIZE should be the actual size-on-disk of an Interval, as shown
- * in pg_type.	This might be less than sizeof(Interval) if the compiler
+ * in pg_type.  This might be less than sizeof(Interval) if the compiler
  * insists on adding alignment padding at the end of the struct.
  */
 #define INTERVALSIZE 16

contrib/cube/cube.c

@@ -104,7 +104,7 @@ bool		g_cube_internal_consistent(NDBOX *key, NDBOX *query, StrategyNumber strate
 ** Auxiliary funxtions
 */
 static double distance_1D(double a1, double a2, double b1, double b2);
-static bool	cube_is_point_internal(NDBOX *cube);
+static bool cube_is_point_internal(NDBOX *cube);
 
 
 /*****************************************************************************
@@ -538,7 +538,7 @@ g_cube_picksplit(PG_FUNCTION_ARGS)
 	rt_cube_size(datum_r, &size_r);
 
 	/*
-	 * Now split up the regions between the two seeds.	An important property
+	 * Now split up the regions between the two seeds.  An important property
 	 * of this split algorithm is that the split vector v has the indices of
 	 * items to be split in order in its left and right vectors.  We exploit
 	 * this property by doing a merge in the code that actually splits the
@@ -554,7 +554,7 @@ g_cube_picksplit(PG_FUNCTION_ARGS)
 	{
 		/*
 		 * If we've already decided where to place this item, just put it on
-		 * the right list.	Otherwise, we need to figure out which page needs
+		 * the right list.  Otherwise, we need to figure out which page needs
 		 * the least enlargement in order to store the item.
 		 */
 
@@ -728,27 +728,27 @@ cube_union_v0(NDBOX *a, NDBOX *b)
 	SET_VARSIZE(result, size);
 	SET_DIM(result, dim);
 
-	 /* First compute the union of the dimensions present in both args */
+	/* First compute the union of the dimensions present in both args */
 	for (i = 0; i < DIM(b); i++)
 	{
 		result->x[i] = Min(
-			Min(LL_COORD(a, i), UR_COORD(a, i)),
-			Min(LL_COORD(b, i), UR_COORD(b, i))
-		);
+						   Min(LL_COORD(a, i), UR_COORD(a, i)),
+						   Min(LL_COORD(b, i), UR_COORD(b, i))
+			);
 		result->x[i + DIM(a)] = Max(
-			Max(LL_COORD(a, i), UR_COORD(a, i)),
-			Max(LL_COORD(b, i), UR_COORD(b, i))
-		);
+									Max(LL_COORD(a, i), UR_COORD(a, i)),
+									Max(LL_COORD(b, i), UR_COORD(b, i))
+			);
 	}
 	/* continue on the higher dimensions only present in 'a' */
 	for (; i < DIM(a); i++)
 	{
 		result->x[i] = Min(0,
-			Min(LL_COORD(a, i), UR_COORD(a, i))
-		);
+						   Min(LL_COORD(a, i), UR_COORD(a, i))
+			);
 		result->x[i + dim] = Max(0,
-			Max(LL_COORD(a, i), UR_COORD(a, i))
-		);
+								 Max(LL_COORD(a, i), UR_COORD(a, i))
+			);
 	}
 
 	/*
@@ -795,6 +795,7 @@ cube_inter(PG_FUNCTION_ARGS)
 	if (DIM(a) < DIM(b))
 	{
 		NDBOX	   *tmp = b;
+
 		b = a;
 		a = tmp;
 		swapped = true;
@@ -806,27 +807,27 @@ cube_inter(PG_FUNCTION_ARGS)
 	SET_VARSIZE(result, size);
 	SET_DIM(result, dim);
 
-	 /* First compute intersection of the dimensions present in both args */
+	/* First compute intersection of the dimensions present in both args */
 	for (i = 0; i < DIM(b); i++)
 	{
 		result->x[i] = Max(
-			Min(LL_COORD(a, i), UR_COORD(a, i)),
-			Min(LL_COORD(b, i), UR_COORD(b, i))
-		);
+						   Min(LL_COORD(a, i), UR_COORD(a, i)),
+						   Min(LL_COORD(b, i), UR_COORD(b, i))
+			);
 		result->x[i + DIM(a)] = Min(
-			Max(LL_COORD(a, i), UR_COORD(a, i)),
-			Max(LL_COORD(b, i), UR_COORD(b, i))
-		);
+									Max(LL_COORD(a, i), UR_COORD(a, i)),
+									Max(LL_COORD(b, i), UR_COORD(b, i))
+			);
 	}
 	/* continue on the higher dimemsions only present in 'a' */
 	for (; i < DIM(a); i++)
 	{
 		result->x[i] = Max(0,
-			Min(LL_COORD(a, i), UR_COORD(a, i))
-		);
+						   Min(LL_COORD(a, i), UR_COORD(a, i))
+			);
 		result->x[i + DIM(a)] = Min(0,
-			Max(LL_COORD(a, i), UR_COORD(a, i))
-		);
+									Max(LL_COORD(a, i), UR_COORD(a, i))
+			);
 	}
 
 	/*
@@ -1236,14 +1237,14 @@ cube_distance(PG_FUNCTION_ARGS)
 	/* compute within the dimensions of (b) */
 	for (i = 0; i < DIM(b); i++)
 	{
-		d = distance_1D(LL_COORD(a,i), UR_COORD(a,i), LL_COORD(b,i), UR_COORD(b,i));
+		d = distance_1D(LL_COORD(a, i), UR_COORD(a, i), LL_COORD(b, i), UR_COORD(b, i));
 		distance += d * d;
 	}
 
 	/* compute distance to zero for those dimensions in (a) absent in (b) */
 	for (i = DIM(b); i < DIM(a); i++)
 	{
-		d = distance_1D(LL_COORD(a,i), UR_COORD(a,i), 0.0, 0.0);
+		d = distance_1D(LL_COORD(a, i), UR_COORD(a, i), 0.0, 0.0);
 		distance += d * d;
 	}
 
@@ -1297,11 +1298,11 @@ cube_is_point_internal(NDBOX *cube)
 		return true;
 
 	/*
-	 * Even if the point-flag is not set, all the lower-left coordinates
-	 * might match the upper-right coordinates, so that the value is in
-	 * fact a point. Such values don't arise with current code - the point
-	 * flag is always set if appropriate - but they might be present on-disk
-	 * in clusters upgraded from pre-9.4 versions.
+	 * Even if the point-flag is not set, all the lower-left coordinates might
+	 * match the upper-right coordinates, so that the value is in fact a
+	 * point. Such values don't arise with current code - the point flag is
+	 * always set if appropriate - but they might be present on-disk in
+	 * clusters upgraded from pre-9.4 versions.
 	 */
 	for (i = 0; i < DIM(cube); i++)
 	{
@@ -1317,6 +1318,7 @@ cube_dim(PG_FUNCTION_ARGS)
 {
 	NDBOX	   *c = PG_GETARG_NDBOX(0);
 	int			dim = DIM(c);
+
 	PG_FREE_IF_COPY(c, 0);
 	PG_RETURN_INT32(dim);
 }
@@ -1330,7 +1332,7 @@ cube_ll_coord(PG_FUNCTION_ARGS)
 	double		result;
 
 	if (DIM(c) >= n && n > 0)
-		result = Min(LL_COORD(c, n-1), UR_COORD(c, n-1));
+		result = Min(LL_COORD(c, n - 1), UR_COORD(c, n - 1));
 	else
 		result = 0;
 
@@ -1347,7 +1349,7 @@ cube_ur_coord(PG_FUNCTION_ARGS)
 	double		result;
 
 	if (DIM(c) >= n && n > 0)
-		result = Max(LL_COORD(c, n-1), UR_COORD(c, n-1));
+		result = Max(LL_COORD(c, n - 1), UR_COORD(c, n - 1));
 	else
 		result = 0;
 
@@ -1382,15 +1384,15 @@ cube_enlarge(PG_FUNCTION_ARGS)
 
 	for (i = 0, j = dim; i < DIM(a); i++, j++)
 	{
-		if (LL_COORD(a,i) >= UR_COORD(a,i))
+		if (LL_COORD(a, i) >= UR_COORD(a, i))
 		{
-			result->x[i] = UR_COORD(a,i) - r;
-			result->x[j] = LL_COORD(a,i) + r;
+			result->x[i] = UR_COORD(a, i) - r;
+			result->x[j] = LL_COORD(a, i) + r;
 		}
 		else
 		{
-			result->x[i] = LL_COORD(a,i) - r;
-			result->x[j] = UR_COORD(a,i) + r;
+			result->x[i] = LL_COORD(a, i) - r;
+			result->x[j] = UR_COORD(a, i) + r;
 		}
 		if (result->x[i] > result->x[j])
 		{
@@ -1503,7 +1505,7 @@ cube_c_f8(PG_FUNCTION_ARGS)
 			result->x[DIM(result) + i] = cube->x[DIM(cube) + i];
 		}
 		result->x[DIM(result) - 1] = x;
-		result->x[2*DIM(result) - 1] = x;
+		result->x[2 * DIM(result) - 1] = x;
 	}
 
 	PG_FREE_IF_COPY(cube, 0);
@@ -1521,7 +1523,8 @@ cube_c_f8_f8(PG_FUNCTION_ARGS)
 	int			size;
 	int			i;
 
-	if (IS_POINT(cube) && (x1 == x2)){
+	if (IS_POINT(cube) && (x1 == x2))
+	{
 		size = POINT_SIZE((DIM(cube) + 1));
 		result = (NDBOX *) palloc0(size);
 		SET_VARSIZE(result, size);

contrib/cube/cubedata.h

@@ -13,9 +13,9 @@ typedef struct NDBOX
 	 *
 	 * Following information is stored:
 	 *
-	 *  bits 0-7  : number of cube dimensions;
-	 *  bits 8-30 : unused, initialize to zero;
-	 *  bit  31   : point flag. If set, the upper right coordinates are not
+	 *	bits 0-7  : number of cube dimensions;
+	 *	bits 8-30 : unused, initialize to zero;
+	 *	bit  31   : point flag. If set, the upper right coordinates are not
 	 *				stored, and are implicitly the same as the lower left
 	 *				coordinates.
 	 *----------
@@ -31,12 +31,12 @@ typedef struct NDBOX
 } NDBOX;
 
 #define POINT_BIT			0x80000000
-#define	DIM_MASK			0x7fffffff
+#define DIM_MASK			0x7fffffff
 
 #define IS_POINT(cube)		( ((cube)->header & POINT_BIT) != 0 )
-#define SET_POINT_BIT(cube)	( (cube)->header |= POINT_BIT )
+#define SET_POINT_BIT(cube) ( (cube)->header |= POINT_BIT )
 #define DIM(cube)			( (cube)->header & DIM_MASK )
-#define SET_DIM(cube, _dim)	( (cube)->header = ((cube)->header & ~DIM_MASK) | (_dim) )
+#define SET_DIM(cube, _dim) ( (cube)->header = ((cube)->header & ~DIM_MASK) | (_dim) )
 
 #define LL_COORD(cube, i) ( (cube)->x[i] )
 #define UR_COORD(cube, i) ( IS_POINT(cube) ? (cube)->x[i] : (cube)->x[(i) + DIM(cube)] )

contrib/dblink/dblink.c

@@ -2394,7 +2394,7 @@ get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pk
 	 * Build sql statement to look up tuple of interest, ie, the one matching
 	 * src_pkattvals.  We used to use "SELECT *" here, but it's simpler to
 	 * generate a result tuple that matches the table's physical structure,
-	 * with NULLs for any dropped columns.	Otherwise we have to deal with two
+	 * with NULLs for any dropped columns.  Otherwise we have to deal with two
 	 * different tupdescs and everything's very confusing.
 	 */
 	appendStringInfoString(&buf, "SELECT ");
@@ -2620,7 +2620,7 @@ dblink_security_check(PGconn *conn, remoteConn *rconn)
 }
 
 /*
- * For non-superusers, insist that the connstr specify a password.	This
+ * For non-superusers, insist that the connstr specify a password.  This
  * prevents a password from being picked up from .pgpass, a service file,
  * the environment, etc.  We don't want the postgres user's passwords
  * to be accessible to non-superusers.

contrib/earthdistance/earthdistance.c

@@ -91,7 +91,7 @@ geo_distance_internal(Point *pt1, Point *pt2)
  *	 distance between the points in miles on earth's surface
  *
  * If float8 is passed-by-value, the oldstyle version-0 calling convention
- * is unportable, so we use version-1.	However, if it's passed-by-reference,
+ * is unportable, so we use version-1.  However, if it's passed-by-reference,
  * continue to use oldstyle.  This is just because we'd like earthdistance
  * to serve as a canary for any unintentional breakage of version-0 functions
  * with float8 results.

contrib/file_fdw/file_fdw.c

@@ -70,6 +70,7 @@ static const struct FileFdwOption valid_options[] = {
 	{"encoding", ForeignTableRelationId},
 	{"force_not_null", AttributeRelationId},
 	{"force_null", AttributeRelationId},
+
 	/*
 	 * force_quote is not supported by file_fdw because it's for COPY TO.
 	 */
@@ -253,6 +254,7 @@ file_fdw_validator(PG_FUNCTION_ARGS)
 						 errmsg("conflicting or redundant options")));
 			filename = defGetString(def);
 		}
+
 		/*
 		 * force_not_null is a boolean option; after validation we can discard
 		 * it - it will be retrieved later in get_file_fdw_attribute_options()
@@ -397,7 +399,7 @@ get_file_fdw_attribute_options(Oid relid)
 	List	   *fnncolumns = NIL;
 	List	   *fncolumns = NIL;
 
-	List *options = NIL;
+	List	   *options = NIL;
 
 	rel = heap_open(relid, AccessShareLock);
 	tupleDesc = RelationGetDescr(rel);
@@ -443,12 +445,15 @@ get_file_fdw_attribute_options(Oid relid)
 
 	heap_close(rel, AccessShareLock);
 
-	/* Return DefElem only when some column(s) have force_not_null / force_null options set */
+	/*
+	 * Return DefElem only when some column(s) have force_not_null /
+	 * force_null options set
+	 */
 	if (fnncolumns != NIL)
 		options = lappend(options, makeDefElem("force_not_null", (Node *) fnncolumns));
 
 	if (fncolumns != NIL)
-		options = lappend(options,makeDefElem("force_null", (Node *) fncolumns));
+		options = lappend(options, makeDefElem("force_null", (Node *) fncolumns));
 
 	return options;
 }
@@ -508,7 +513,7 @@ fileGetForeignPaths(PlannerInfo *root,
 				   &startup_cost, &total_cost);
 
 	/*
-	 * Create a ForeignPath node and add it as only possible path.	We use the
+	 * Create a ForeignPath node and add it as only possible path.  We use the
 	 * fdw_private list of the path to carry the convert_selectively option;
 	 * it will be propagated into the fdw_private list of the Plan node.
 	 */
@@ -921,7 +926,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;
@@ -986,7 +991,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