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 e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 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/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us

1 files changed, 11 insertions, 11 deletions

diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index 1ad4ed6da75..bfef2df4206 100644
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -118,7 +118,7 @@ typedef struct GISTSearchHeapItem
 {
 	ItemPointerData heapPtr;
 	bool		recheck;		/* T if quals must be rechecked */
-	bool		recheckDistances;		/* T if distances must be rechecked */
+	bool		recheckDistances;	/* T if distances must be rechecked */
 	HeapTuple	recontup;		/* data reconstructed from the index, used in
 								 * index-only scans */
 	OffsetNumber offnum;		/* track offset in page to mark tuple as
@@ -136,8 +136,8 @@ typedef struct GISTSearchItem
 		/* we must store parentlsn to detect whether a split occurred */
 		GISTSearchHeapItem heap;	/* heap info, if heap tuple */
 	}			data;
-	double		distances[FLEXIBLE_ARRAY_MEMBER];		/* numberOfOrderBys
-														 * entries */
+	double		distances[FLEXIBLE_ARRAY_MEMBER];	/* numberOfOrderBys
+													 * entries */
 } GISTSearchItem;
 
 #define GISTSearchItemIsHeap(item)	((item).blkno == InvalidBlockNumber)
@@ -225,12 +225,12 @@ typedef struct GistSplitVector
 {
 	GIST_SPLITVEC splitVector;	/* passed to/from user PickSplit method */
 
-	Datum		spl_lattr[INDEX_MAX_KEYS];		/* Union of subkeys in
-												 * splitVector.spl_left */
+	Datum		spl_lattr[INDEX_MAX_KEYS];	/* Union of subkeys in
+											 * splitVector.spl_left */
 	bool		spl_lisnull[INDEX_MAX_KEYS];
 
-	Datum		spl_rattr[INDEX_MAX_KEYS];		/* Union of subkeys in
-												 * splitVector.spl_right */
+	Datum		spl_rattr[INDEX_MAX_KEYS];	/* Union of subkeys in
+											 * splitVector.spl_right */
 	bool		spl_risnull[INDEX_MAX_KEYS];
 
 	bool	   *spl_dontcare;	/* flags tuples which could go to either side
@@ -288,7 +288,7 @@ typedef struct
 	int32		blocksCount;	/* current # of blocks occupied by buffer */
 
 	BlockNumber pageBlocknum;	/* temporary file block # */
-	GISTNodeBufferPage *pageBuffer;		/* in-memory buffer page */
+	GISTNodeBufferPage *pageBuffer; /* in-memory buffer page */
 
 	/* is this buffer queued for emptying? */
 	bool		queuedForEmptying;
@@ -360,8 +360,8 @@ typedef struct GISTBuildBuffers
 	 * loaded in main memory.
 	 */
 	GISTNodeBuffer **loadedBuffers;
-	int			loadedBuffersCount;		/* # of entries in loadedBuffers */
-	int			loadedBuffersLen;		/* allocated size of loadedBuffers */
+	int			loadedBuffersCount; /* # of entries in loadedBuffers */
+	int			loadedBuffersLen;	/* allocated size of loadedBuffers */
 
 	/* Level of the current root node (= height of the index tree - 1) */
 	int			rootlevel;
@@ -522,4 +522,4 @@ extern void gistRelocateBuildBuffersOnSplit(GISTBuildBuffers *gfbb,
 								List *splitinfo);
 extern void gistUnloadNodeBuffers(GISTBuildBuffers *gfbb);
 
-#endif   /* GIST_PRIVATE_H */
+#endif							/* GIST_PRIVATE_H */