Phase 2 of pgindent updates.

Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.

Commit e3860ff wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code.  The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there.  BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs.  So the
net result is that in about half the cases, such comments are placed
one tab stop left of before.  This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.

Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.

This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.

Discussion: https://postgr.es/m/[email protected]
Discussion: https://postgr.es/m/[email protected]

Author: tglsfdc

contrib/bloom/bloom.h

@@ -75,7 +75,7 @@ typedef BloomPageOpaqueData *BloomPageOpaque;
 
 /* Preserved page numbers */
 #define BLOOM_METAPAGE_BLKNO	(0)
-#define BLOOM_HEAD_BLKNO		(1)		/* first data page */
+#define BLOOM_HEAD_BLKNO		(1) /* first data page */
 
 /*
  * We store Bloom signatures as arrays of uint16 words.
@@ -101,8 +101,8 @@ typedef struct BloomOptions
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	int			bloomLength;	/* length of signature in words (not bits!) */
-	int			bitSize[INDEX_MAX_KEYS];		/* # of bits generated for
-												 * each index key */
+	int			bitSize[INDEX_MAX_KEYS];	/* # of bits generated for each
+											 * index key */
 } BloomOptions;
 
 /*

contrib/btree_gist/btree_utils_num.h

@@ -42,13 +42,13 @@ typedef struct
 
 	/* Methods */
 
-	bool		(*f_gt) (const void *, const void *, FmgrInfo *);		/* greater than */
-	bool		(*f_ge) (const void *, const void *, FmgrInfo *);		/* greater or equal */
-	bool		(*f_eq) (const void *, const void *, FmgrInfo *);		/* equal */
-	bool		(*f_le) (const void *, const void *, FmgrInfo *);		/* less or equal */
-	bool		(*f_lt) (const void *, const void *, FmgrInfo *);		/* less than */
-	int			(*f_cmp) (const void *, const void *, FmgrInfo *);		/* key compare function */
-	float8		(*f_dist) (const void *, const void *, FmgrInfo *);		/* key distance function */
+	bool		(*f_gt) (const void *, const void *, FmgrInfo *);	/* greater than */
+	bool		(*f_ge) (const void *, const void *, FmgrInfo *);	/* greater or equal */
+	bool		(*f_eq) (const void *, const void *, FmgrInfo *);	/* equal */
+	bool		(*f_le) (const void *, const void *, FmgrInfo *);	/* less or equal */
+	bool		(*f_lt) (const void *, const void *, FmgrInfo *);	/* less than */
+	int			(*f_cmp) (const void *, const void *, FmgrInfo *);	/* key compare function */
+	float8		(*f_dist) (const void *, const void *, FmgrInfo *); /* key distance function */
 } gbtree_ninfo;
 
 

contrib/btree_gist/btree_utils_var.c

@@ -488,7 +488,7 @@ gbt_var_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v,
 
 		cur = (char *) DatumGetPointer(entryvec->vector[i].key);
 		ro = gbt_var_key_readable((GBT_VARKEY *) cur);
-		if (ro.lower == ro.upper)		/* leaf */
+		if (ro.lower == ro.upper)	/* leaf */
 		{
 			sv[svcntr] = gbt_var_leaf2node((GBT_VARKEY *) cur, tinfo, flinfo);
 			arr[i].t = sv[svcntr];

contrib/btree_gist/btree_utils_var.h

@@ -40,7 +40,7 @@ typedef struct
 	bool		(*f_le) (const void *, const void *, Oid, FmgrInfo *);	/* less equal */
 	bool		(*f_lt) (const void *, const void *, Oid, FmgrInfo *);	/* less than */
 	int32		(*f_cmp) (const void *, const void *, Oid, FmgrInfo *); /* compare */
-	GBT_VARKEY *(*f_l2n) (GBT_VARKEY *, FmgrInfo *flinfo);		/* convert leaf to node */
+	GBT_VARKEY *(*f_l2n) (GBT_VARKEY *, FmgrInfo *flinfo);	/* convert leaf to node */
 } gbtree_vinfo;
 
 

contrib/btree_gist/btree_uuid.c

@@ -171,7 +171,7 @@ static double
 uuid_2_double(const pg_uuid_t *u)
 {
 	uint64		uu[2];
-	const double two64 = 18446744073709551616.0;		/* 2^64 */
+	const double two64 = 18446744073709551616.0;	/* 2^64 */
 
 	/* Source data may not be suitably aligned, so copy */
 	memcpy(uu, u->data, UUID_LEN);

contrib/cube/cubedata.h

@@ -54,10 +54,10 @@ typedef struct NDBOX
 #define PG_RETURN_NDBOX(x)	PG_RETURN_POINTER(x)
 
 /* GiST operator strategy numbers */
-#define CubeKNNDistanceCoord			15		/* ~> */
-#define CubeKNNDistanceTaxicab			16		/* <#> */
-#define CubeKNNDistanceEuclid			17		/* <-> */
-#define CubeKNNDistanceChebyshev		18		/* <=> */
+#define CubeKNNDistanceCoord			15	/* ~> */
+#define CubeKNNDistanceTaxicab			16	/* <#> */
+#define CubeKNNDistanceEuclid			17	/* <-> */
+#define CubeKNNDistanceChebyshev		18	/* <=> */
 
 /* in cubescan.l */
 extern int	cube_yylex(void);

contrib/dblink/dblink.c

@@ -67,7 +67,7 @@ typedef struct remoteConn
 {
 	PGconn	   *conn;			/* Hold the remote connection */
 	int			openCursorCount;	/* The number of open cursors */
-	bool		newXactForCursor;		/* Opened a transaction for a cursor */
+	bool		newXactForCursor;	/* Opened a transaction for a cursor */
 } remoteConn;
 
 typedef struct storeInfo
@@ -1098,7 +1098,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql)
 	if (!PQsendQuery(conn, sql))
 		elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn)));
 
-	if (!PQsetSingleRowMode(conn))		/* shouldn't fail */
+	if (!PQsetSingleRowMode(conn))	/* shouldn't fail */
 		elog(ERROR, "failed to set single-row mode for dblink query");
 
 	for (;;)

contrib/file_fdw/file_fdw.c

@@ -544,13 +544,13 @@ fileGetForeignPaths(PlannerInfo *root,
 	 */
 	add_path(baserel, (Path *)
 			 create_foreignscan_path(root, baserel,
-									 NULL,		/* default pathtarget */
+									 NULL,	/* default pathtarget */
 									 baserel->rows,
 									 startup_cost,
 									 total_cost,
-									 NIL,		/* no pathkeys */
-									 NULL,		/* no outer rel either */
-									 NULL,		/* no extra plan */
+									 NIL,	/* no pathkeys */
+									 NULL,	/* no outer rel either */
+									 NULL,	/* no extra plan */
 									 coptions));
 
 	/*

contrib/fuzzystrmatch/dmetaphone.c

@@ -111,7 +111,7 @@ The remaining code is authored by Andrew Dunstan <[email protected]> and
 #include <string.h>
 #include <stdarg.h>
 
-#endif   /* DMETAPHONE_MAIN */
+#endif							/* DMETAPHONE_MAIN */
 
 #include <assert.h>
 #include <ctype.h>
@@ -197,7 +197,7 @@ dmetaphone_alt(PG_FUNCTION_ARGS)
  * in a case like this.
  */
 
-#define META_FREE(x) ((void)true)		/* pfree((x)) */
+#define META_FREE(x) ((void)true)	/* pfree((x)) */
 #else							/* not defined DMETAPHONE_MAIN */
 
 /* use the standard malloc library when not running in PostgreSQL */
@@ -209,7 +209,7 @@ dmetaphone_alt(PG_FUNCTION_ARGS)
 					  (v = (t*)realloc((v),((n)*sizeof(t))))
 
 #define META_FREE(x) free((x))
-#endif   /* defined DMETAPHONE_MAIN */
+#endif							/* defined DMETAPHONE_MAIN */
 
 
 
@@ -977,7 +977,7 @@ DoubleMetaphone(char *str, char **codes)
 					}
 				}
 
-				if (GetAt(original, current + 1) == 'J')		/* it could happen! */
+				if (GetAt(original, current + 1) == 'J')	/* it could happen! */
 					current += 2;
 				else
 					current += 1;

contrib/hstore/hstore.h

@@ -181,7 +181,7 @@ extern Pairs *hstoreArrayToPairs(ArrayType *a, int *npairs);
 #define HStoreExistsStrategyNumber		9
 #define HStoreExistsAnyStrategyNumber	10
 #define HStoreExistsAllStrategyNumber	11
-#define HStoreOldContainsStrategyNumber 13		/* backwards compatibility */
+#define HStoreOldContainsStrategyNumber 13	/* backwards compatibility */
 
 /*
  * defining HSTORE_POLLUTE_NAMESPACE=0 will prevent use of old function names;
@@ -202,4 +202,4 @@ extern Pairs *hstoreArrayToPairs(ArrayType *a, int *npairs);
 	extern int no_such_variable
 #endif
 
-#endif   /* __HSTORE_H__ */
+#endif							/* __HSTORE_H__ */

contrib/hstore/hstore_io.c

@@ -829,7 +829,7 @@ hstore_from_record(PG_FUNCTION_ARGS)
 		my_extra->ncolumns = ncolumns;
 	}
 
-	Assert(ncolumns <= MaxTupleAttributeNumber);		/* thus, no overflow */
+	Assert(ncolumns <= MaxTupleAttributeNumber);	/* thus, no overflow */
 	pairs = palloc(ncolumns * sizeof(Pairs));
 
 	if (rec)

contrib/intarray/_int.h

@@ -173,4 +173,4 @@ int			compDESC(const void *a, const void *b);
 				  (direction) ? compASC : compDESC ); \
 	} while(0)
 
-#endif   /* ___INT_H__ */
+#endif							/* ___INT_H__ */

contrib/intarray/_int_tool.c

@@ -282,7 +282,7 @@ internal_size(int *a, int len)
 
 	for (i = 0; i < len; i += 2)
 	{
-		if (!i || a[i] != a[i - 1])		/* do not count repeated range */
+		if (!i || a[i] != a[i - 1]) /* do not count repeated range */
 			size += a[i + 1] - a[i] + 1;
 	}
 

contrib/isn/isn.c

@@ -131,7 +131,7 @@ check_table(const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
 	elog(DEBUG1, "index %d is invalid", j);
 	return false;
 }
-#endif   /* ISN_DEBUG */
+#endif							/* ISN_DEBUG */
 
 /*----------------------------------------------------------
  * Formatting and conversion routines.
@@ -699,11 +699,11 @@ string2ean(const char *str, bool errorOK, ean13 *result,
 	/* recognize and validate the number: */
 	while (*aux2 && length <= 13)
 	{
-		last = (*(aux2 + 1) == '!' || *(aux2 + 1) == '\0');		/* is the last character */
+		last = (*(aux2 + 1) == '!' || *(aux2 + 1) == '\0'); /* is the last character */
 		digit = (isdigit((unsigned char) *aux2) != 0);	/* is current character
 														 * a digit? */
-		if (*aux2 == '?' && last)		/* automagically calculate check digit
-										 * if it's '?' */
+		if (*aux2 == '?' && last)	/* automagically calculate check digit if
+									 * it's '?' */
 			magic = digit = true;
 		if (length == 0 && (*aux2 == 'M' || *aux2 == 'm'))
 		{
@@ -832,8 +832,8 @@ string2ean(const char *str, bool errorOK, ean13 *result,
 				goto eanwrongtype;
 			break;
 		case ISMN:
-			memcpy(buf, "9790", 4);		/* this isn't for sure yet, for now
-										 * ISMN it's only 9790 */
+			memcpy(buf, "9790", 4); /* this isn't for sure yet, for now ISMN
+									 * it's only 9790 */
 			valid = (valid && ((rcheck = checkdig(buf, 13)) == check || magic));
 			break;
 		case ISBN:
@@ -1123,7 +1123,7 @@ accept_weak_input(PG_FUNCTION_ARGS)
 	g_weak = PG_GETARG_BOOL(0);
 #else
 	/* function has no effect */
-#endif   /* ISN_WEAK_MODE */
+#endif							/* ISN_WEAK_MODE */
 	PG_RETURN_BOOL(g_weak);
 }
 

contrib/isn/isn.h

@@ -32,4 +32,4 @@ typedef uint64 ean13;
 
 extern void initialize(void);
 
-#endif   /* ISN_H */
+#endif							/* ISN_H */

contrib/lo/lo.c

@@ -32,11 +32,11 @@ lo_manage(PG_FUNCTION_ARGS)
 	HeapTuple	newtuple;		/* The new value for tuple		*/
 	HeapTuple	trigtuple;		/* The original value of tuple	*/
 
-	if (!CALLED_AS_TRIGGER(fcinfo))		/* internal error */
+	if (!CALLED_AS_TRIGGER(fcinfo)) /* internal error */
 		elog(ERROR, "%s: not fired by trigger manager",
 			 trigdata->tg_trigger->tgname);
 
-	if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))		/* internal error */
+	if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event)) /* internal error */
 		elog(ERROR, "%s: must be fired for row",
 			 trigdata->tg_trigger->tgname);
 

contrib/ltree/ltree.h

@@ -125,7 +125,7 @@ typedef struct
 #define OPR						3
 #define OPEN					4
 #define CLOSE					5
-#define VALTRUE					6		/* for stop words */
+#define VALTRUE					6	/* for stop words */
 #define VALFALSE				7
 
 

contrib/ltree/ltree_gist.c

@@ -302,7 +302,7 @@ ltree_picksplit(PG_FUNCTION_ARGS)
 	for (j = FirstOffsetNumber; j <= maxoff; j = OffsetNumberNext(j))
 	{
 		array[j].index = j;
-		lu = GETENTRY(entryvec, j);		/* use as tmp val */
+		lu = GETENTRY(entryvec, j); /* use as tmp val */
 		array[j].r = LTG_GETLNODE(lu);
 	}
 
@@ -312,7 +312,7 @@ ltree_picksplit(PG_FUNCTION_ARGS)
 	lu_l = lu_r = ru_l = ru_r = NULL;
 	for (j = FirstOffsetNumber; j <= maxoff; j = OffsetNumberNext(j))
 	{
-		lu = GETENTRY(entryvec, array[j].index);		/* use as tmp val */
+		lu = GETENTRY(entryvec, array[j].index);	/* use as tmp val */
 		if (j <= (maxoff - FirstOffsetNumber + 1) / 2)
 		{
 			v->spl_left[v->spl_nleft] = array[j].index;

contrib/pageinspect/pageinspect.h

@@ -18,4 +18,4 @@
 /* in rawpage.c */
 extern Page get_page_from_raw(bytea *raw_page);
 
-#endif   /* _PAGEINSPECT_H_ */
+#endif							/* _PAGEINSPECT_H_ */

contrib/pg_buffercache/pg_buffercache_pages.c

@@ -66,7 +66,7 @@ pg_buffercache_pages(PG_FUNCTION_ARGS)
 	FuncCallContext *funcctx;
 	Datum		result;
 	MemoryContext oldcontext;
-	BufferCachePagesContext *fctx;		/* User function context. */
+	BufferCachePagesContext *fctx;	/* User function context. */
 	TupleDesc	tupledesc;
 	TupleDesc	expected_tupledesc;
 	HeapTuple	tuple;

contrib/pg_standby/pg_standby.c

@@ -44,8 +44,8 @@ int			maxwaittime = 0;	/* how long are we prepared to wait for? */
 int			keepfiles = 0;		/* number of WAL files to keep, 0 keep all */
 int			maxretries = 3;		/* number of retries on restore command */
 bool		debug = false;		/* are we debugging? */
-bool		need_cleanup = false;		/* do we need to remove files from
-										 * archive? */
+bool		need_cleanup = false;	/* do we need to remove files from
+									 * archive? */
 
 #ifndef WIN32
 static volatile sig_atomic_t signaled = false;
@@ -59,8 +59,8 @@ char	   *restartWALFileName; /* the file from which we can restart restore */
 char	   *priorWALFileName;	/* the file we need to get from archive */
 char		WALFilePath[MAXPGPATH * 2]; /* the file path including archive */
 char		restoreCommand[MAXPGPATH];	/* run this to restore */
-char		exclusiveCleanupFileName[MAXFNAMELEN];		/* the file we need to
-														 * get from archive */
+char		exclusiveCleanupFileName[MAXFNAMELEN];	/* the file we need to get
+													 * from archive */
 
 /*
  * Two types of failover are supported (smart and fast failover).
@@ -582,7 +582,7 @@ main(int argc, char **argv)
 	 * There's no way to trigger failover via signal on Windows.
 	 */
 	(void) pqsignal(SIGUSR1, sighandler);
-	(void) pqsignal(SIGINT, sighandler);		/* deprecated, use SIGUSR1 */
+	(void) pqsignal(SIGINT, sighandler);	/* deprecated, use SIGUSR1 */
 	(void) pqsignal(SIGQUIT, sigquit_handler);
 #endif