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/[email protected]
Discussion: https://postgr.es/m/[email protected]

34 files changed, 45 insertions, 46 deletions

diff --git a/src/include/commands/alter.h b/src/include/commands/alter.h
index b7aa86cb57f..4365357ab83 100644
--- a/src/include/commands/alter.h
+++ b/src/include/commands/alter.h
@@ -32,4 +32,4 @@ extern ObjectAddress ExecAlterOwnerStmt(AlterOwnerStmt *stmt);
 extern void AlterObjectOwner_internal(Relation catalog, Oid objectId,
 						  Oid new_ownerId);
 
-#endif   /* ALTER_H */
+#endif							/* ALTER_H */
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index b7842d1a0fe..939711d8d94 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -54,4 +54,4 @@ extern void HandleNotifyInterrupt(void);
 /* process interrupts */
 extern void ProcessNotifyInterrupt(void);
 
-#endif   /* ASYNC_H */
+#endif							/* ASYNC_H */
diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h
index 7c9d4746d93..7bade9fad2d 100644
--- a/src/include/commands/cluster.h
+++ b/src/include/commands/cluster.h
@@ -36,4 +36,4 @@ extern void finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap,
 				 MultiXactId minMulti,
 				 char newrelpersistence);
 
-#endif   /* CLUSTER_H */
+#endif							/* CLUSTER_H */
diff --git a/src/include/commands/collationcmds.h b/src/include/commands/collationcmds.h
index df5623ccb6d..30e847432e2 100644
--- a/src/include/commands/collationcmds.h
+++ b/src/include/commands/collationcmds.h
@@ -22,4 +22,4 @@ extern ObjectAddress DefineCollation(ParseState *pstate, List *names, List *para
 extern void IsThereCollationInNamespace(const char *collname, Oid nspOid);
 extern ObjectAddress AlterCollation(AlterCollationStmt *stmt);
 
-#endif   /* COLLATIONCMDS_H */
+#endif							/* COLLATIONCMDS_H */
diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h
index 684ea8b6971..85bd8015136 100644
--- a/src/include/commands/comment.h
+++ b/src/include/commands/comment.h
@@ -42,4 +42,4 @@ extern void CreateSharedComments(Oid oid, Oid classoid, char *comment);
 
 extern char *GetComment(Oid oid, Oid classoid, int32 subid);
 
-#endif   /* COMMENT_H */
+#endif							/* COMMENT_H */
diff --git a/src/include/commands/conversioncmds.h b/src/include/commands/conversioncmds.h
index 20d7f0e9b10..70545057945 100644
--- a/src/include/commands/conversioncmds.h
+++ b/src/include/commands/conversioncmds.h
@@ -20,4 +20,4 @@
 
 extern ObjectAddress CreateConversionCommand(CreateConversionStmt *parsetree);
 
-#endif   /* CONVERSIONCMDS_H */
+#endif							/* CONVERSIONCMDS_H */
diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h
index f081f2219f2..8b2971d2871 100644
--- a/src/include/commands/copy.h
+++ b/src/include/commands/copy.h
@@ -41,4 +41,4 @@ extern uint64 CopyFrom(CopyState cstate);
 
 extern DestReceiver *CreateCopyDestReceiver(void);
 
-#endif   /* COPY_H */
+#endif							/* COPY_H */
diff --git a/src/include/commands/createas.h b/src/include/commands/createas.h
index c3c43f6b36f..4e13f7deae7 100644
--- a/src/include/commands/createas.h
+++ b/src/include/commands/createas.h
@@ -28,4 +28,4 @@ extern int	GetIntoRelEFlags(IntoClause *intoClause);
 
 extern DestReceiver *CreateIntoRelDestReceiver(IntoClause *intoClause);
 
-#endif   /* CREATEAS_H */
+#endif							/* CREATEAS_H */
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index 52918a9f4b2..f42c8cdbe30 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -31,4 +31,4 @@ extern char *get_database_name(Oid dbid);
 
 extern void check_encoding_locale_matches(int encoding, const char *collate, const char *ctype);
 
-#endif   /* DBCOMMANDS_H */
+#endif							/* DBCOMMANDS_H */
diff --git a/src/include/commands/dbcommands_xlog.h b/src/include/commands/dbcommands_xlog.h
index 6583d0d5bd9..63b1a6470c0 100644
--- a/src/include/commands/dbcommands_xlog.h
+++ b/src/include/commands/dbcommands_xlog.h
@@ -41,4 +41,4 @@ extern void dbase_redo(XLogReaderState *rptr);
 extern void dbase_desc(StringInfo buf, XLogReaderState *rptr);
 extern const char *dbase_identify(uint8 info);
 
-#endif   /* DBCOMMANDS_XLOG_H */
+#endif							/* DBCOMMANDS_XLOG_H */
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 5dd14b43d3b..f7bb4a54f77 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -164,4 +164,4 @@ extern TypeName *defGetTypeName(DefElem *def);
 extern int	defGetTypeLength(DefElem *def);
 extern List *defGetStringList(DefElem *def);
 
-#endif   /* DEFREM_H */
+#endif							/* DEFREM_H */
diff --git a/src/include/commands/discard.h b/src/include/commands/discard.h
index b960cab51f8..8ea0b30ddf9 100644
--- a/src/include/commands/discard.h
+++ b/src/include/commands/discard.h
@@ -17,4 +17,4 @@
 
 extern void DiscardCommand(DiscardStmt *stmt, bool isTopLevel);
 
-#endif   /* DISCARD_H */
+#endif							/* DISCARD_H */
diff --git a/src/include/commands/event_trigger.h b/src/include/commands/event_trigger.h
index 0017bd0cd41..2ce528272ca 100644
--- a/src/include/commands/event_trigger.h
+++ b/src/include/commands/event_trigger.h
@@ -86,4 +86,4 @@ extern void EventTriggerCollectAlterTSConfig(AlterTSConfigurationStmt *stmt,
 								 Oid cfgId, Oid *dictIds, int ndicts);
 extern void EventTriggerCollectAlterDefPrivs(AlterDefaultPrivilegesStmt *stmt);
 
-#endif   /* EVENT_TRIGGER_H */
+#endif							/* EVENT_TRIGGER_H */
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 358bfd84824..4d356071def 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -44,7 +44,7 @@ typedef struct ExplainState
 	List	   *rtable;			/* range table */
 	List	   *rtable_names;	/* alias names for RTEs */
 	List	   *deparse_cxt;	/* context list for deparsing expressions */
-	Bitmapset  *printed_subplans;		/* ids of SubPlans we've printed */
+	Bitmapset  *printed_subplans;	/* ids of SubPlans we've printed */
 } ExplainState;
 
 /* Hook for plugins to get control in ExplainOneQuery() */
@@ -101,4 +101,4 @@ extern void ExplainPropertyFloat(const char *qlabel, double value, int ndigits,
 extern void ExplainPropertyBool(const char *qlabel, bool value,
 					ExplainState *es);
 
-#endif   /* EXPLAIN_H */
+#endif							/* EXPLAIN_H */
diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h
index 7f027d9dc7a..73bba3c784a 100644
--- a/src/include/commands/extension.h
+++ b/src/include/commands/extension.h
@@ -53,4 +53,4 @@ extern ObjectAddress AlterExtensionNamespace(const char *extensionName, const ch
 
 extern void AlterExtensionOwner_oid(Oid extensionOid, Oid newOwnerId);
 
-#endif   /* EXTENSION_H */
+#endif							/* EXTENSION_H */
diff --git a/src/include/commands/lockcmds.h b/src/include/commands/lockcmds.h
index 45ed96d4d17..cdb5c62a521 100644
--- a/src/include/commands/lockcmds.h
+++ b/src/include/commands/lockcmds.h
@@ -21,4 +21,4 @@
  */
 extern void LockTableCommand(LockStmt *lockstmt);
 
-#endif   /* LOCKCMDS_H */
+#endif							/* LOCKCMDS_H */
diff --git a/src/include/commands/matview.h b/src/include/commands/matview.h
index 129fb92f594..3feb137ef4e 100644
--- a/src/include/commands/matview.h
+++ b/src/include/commands/matview.h
@@ -30,4 +30,4 @@ extern DestReceiver *CreateTransientRelDestReceiver(Oid oid);
 
 extern bool MatViewIncrementalMaintenanceIsEnabled(void);
 
-#endif   /* MATVIEW_H */
+#endif							/* MATVIEW_H */
diff --git a/src/include/commands/policy.h b/src/include/commands/policy.h
index cff93a6cb0e..d6a920ccefe 100644
--- a/src/include/commands/policy.h
+++ b/src/include/commands/policy.h
@@ -35,4 +35,4 @@ extern ObjectAddress rename_policy(RenameStmt *stmt);
 
 extern bool relation_has_policies(Relation rel);
 
-#endif   /* POLICY_H */
+#endif							/* POLICY_H */
diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h
index 8f0e6c48f49..488ce60cd61 100644
--- a/src/include/commands/portalcmds.h
+++ b/src/include/commands/portalcmds.h
@@ -30,4 +30,4 @@ extern void PortalCleanup(Portal portal);
 
 extern void PersistHoldablePortal(Portal portal);
 
-#endif   /* PORTALCMDS_H */
+#endif							/* PORTALCMDS_H */
diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h
index c60e6f30b88..5ec1200e0ae 100644
--- a/src/include/commands/prepare.h
+++ b/src/include/commands/prepare.h
@@ -28,7 +28,7 @@ typedef struct
 {
 	/* dynahash.c requires key to be first field */
 	char		stmt_name[NAMEDATALEN];
-	CachedPlanSource *plansource;		/* the actual cached plan */
+	CachedPlanSource *plansource;	/* the actual cached plan */
 	bool		from_sql;		/* prepared via SQL, not FE/BE protocol? */
 	TimestampTz prepare_time;	/* the time when the stmt was prepared */
 } PreparedStatement;
@@ -57,4 +57,4 @@ extern List *FetchPreparedStatementTargetList(PreparedStatement *stmt);
 
 extern void DropAllPreparedStatements(void);
 
-#endif   /* PREPARE_H */
+#endif							/* PREPARE_H */
diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h
index f056978805d..9a4bc75d120 100644
--- a/src/include/commands/proclang.h
+++ b/src/include/commands/proclang.h
@@ -20,4 +20,4 @@ extern void DropProceduralLanguageById(Oid langOid);
 extern bool PLTemplateExists(const char *languageName);
 extern Oid	get_language_oid(const char *langname, bool missing_ok);
 
-#endif   /* PROCLANG_H */
+#endif							/* PROCLANG_H */
diff --git a/src/include/commands/publicationcmds.h b/src/include/commands/publicationcmds.h
index 7f12ff0a1bc..a2e0f4a21e8 100644
--- a/src/include/commands/publicationcmds.h
+++ b/src/include/commands/publicationcmds.h
@@ -26,4 +26,4 @@ extern void RemovePublicationRelById(Oid proid);
 extern ObjectAddress AlterPublicationOwner(const char *name, Oid newOwnerId);
 extern void AlterPublicationOwner_oid(Oid pubid, Oid newOwnerId);
 
-#endif   /* PUBLICATIONCMDS_H */
+#endif							/* PUBLICATIONCMDS_H */
diff --git a/src/include/commands/schemacmds.h b/src/include/commands/schemacmds.h
index f07a389c7f6..381e5b8dae7 100644
--- a/src/include/commands/schemacmds.h
+++ b/src/include/commands/schemacmds.h
@@ -28,4 +28,4 @@ extern ObjectAddress RenameSchema(const char *oldname, const char *newname);
 extern ObjectAddress AlterSchemaOwner(const char *name, Oid newOwnerId);
 extern void AlterSchemaOwner_oid(Oid schemaOid, Oid newOwnerId);
 
-#endif   /* SCHEMACMDS_H */
+#endif							/* SCHEMACMDS_H */
diff --git a/src/include/commands/seclabel.h b/src/include/commands/seclabel.h
index 2e24801fc19..a97c3293b29 100644
--- a/src/include/commands/seclabel.h
+++ b/src/include/commands/seclabel.h
@@ -31,4 +31,4 @@ typedef void (*check_object_relabel_type) (const ObjectAddress *object,
 extern void register_label_provider(const char *provider,
 						check_object_relabel_type hook);
 
-#endif   /* SECLABEL_H */
+#endif							/* SECLABEL_H */
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index 304586e48e8..caab1951306 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -66,4 +66,4 @@ extern void seq_desc(StringInfo buf, XLogReaderState *rptr);
 extern const char *seq_identify(uint8 info);
 extern void seq_mask(char *pagedata, BlockNumber blkno);
 
-#endif   /* SEQUENCE_H */
+#endif							/* SEQUENCE_H */
diff --git a/src/include/commands/subscriptioncmds.h b/src/include/commands/subscriptioncmds.h
index 1e4428e6175..3d92a682a15 100644
--- a/src/include/commands/subscriptioncmds.h
+++ b/src/include/commands/subscriptioncmds.h
@@ -26,4 +26,4 @@ extern void DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel);
 extern ObjectAddress AlterSubscriptionOwner(const char *name, Oid newOwnerId);
 extern void AlterSubscriptionOwner_oid(Oid subid, Oid newOwnerId);
 
-#endif   /* SUBSCRIPTIONCMDS_H */
+#endif							/* SUBSCRIPTIONCMDS_H */
diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h
index f3a97016a1b..abd31b68d42 100644
--- a/src/include/commands/tablecmds.h
+++ b/src/include/commands/tablecmds.h
@@ -87,4 +87,4 @@ extern void RangeVarCallbackOwnsTable(const RangeVar *relation,
 
 extern void RangeVarCallbackOwnsRelation(const RangeVar *relation,
 							 Oid relId, Oid oldRelId, void *noCatalogs);
-#endif   /* TABLECMDS_H */
+#endif							/* TABLECMDS_H */
diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h
index 3ea13bdf140..ba8de32c7b0 100644
--- a/src/include/commands/tablespace.h
+++ b/src/include/commands/tablespace.h
@@ -63,4 +63,4 @@ extern void tblspc_redo(XLogReaderState *rptr);
 extern void tblspc_desc(StringInfo buf, XLogReaderState *rptr);
 extern const char *tblspc_identify(uint8 info);
 
-#endif   /* TABLESPACE_H */
+#endif							/* TABLESPACE_H */
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index d73969c8747..10ac724febf 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -212,4 +212,4 @@ extern bool RI_Initial_Check(Trigger *trigger,
 
 extern int	RI_FKey_trigger_type(Oid tgfoid);
 
-#endif   /* TRIGGER_H */
+#endif							/* TRIGGER_H */
diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h
index c18f93adb2b..34f6fe328fe 100644
--- a/src/include/commands/typecmds.h
+++ b/src/include/commands/typecmds.h
@@ -54,4 +54,4 @@ extern Oid AlterTypeNamespaceInternal(Oid typeOid, Oid nspOid,
 						   bool errorOnTableType,
 						   ObjectAddresses *objsMoved);
 
-#endif   /* TYPECMDS_H */
+#endif							/* TYPECMDS_H */
diff --git a/src/include/commands/user.h b/src/include/commands/user.h
index 08037e0f81a..028e0dde568 100644
--- a/src/include/commands/user.h
+++ b/src/include/commands/user.h
@@ -34,4 +34,4 @@ extern void DropOwnedObjects(DropOwnedStmt *stmt);
 extern void ReassignOwnedObjects(ReassignOwnedStmt *stmt);
 extern List *roleSpecsToIds(List *memberNames);
 
-#endif   /* USER_H */
+#endif							/* USER_H */
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index 0fa585b091f..a9035112e96 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -136,20 +136,19 @@ typedef struct VacAttrStats
 typedef struct VacuumParams
 {
 	int			freeze_min_age; /* min freeze age, -1 to use default */
-	int			freeze_table_age;		/* age at which to scan whole table */
-	int			multixact_freeze_min_age;		/* min multixact freeze age,
-												 * -1 to use default */
-	int			multixact_freeze_table_age;		/* multixact age at which to
-												 * scan whole table */
+	int			freeze_table_age;	/* age at which to scan whole table */
+	int			multixact_freeze_min_age;	/* min multixact freeze age, -1 to
+											 * use default */
+	int			multixact_freeze_table_age; /* multixact age at which to scan
+											 * whole table */
 	bool		is_wraparound;	/* force a for-wraparound vacuum */
-	int			log_min_duration;		/* minimum execution threshold in ms
-										 * at which  verbose logs are
-										 * activated, -1 to use default */
+	int			log_min_duration;	/* minimum execution threshold in ms at
+									 * which  verbose logs are activated, -1
+									 * to use default */
 } VacuumParams;
 
 /* GUC parameters */
-extern PGDLLIMPORT int default_statistics_target;		/* PGDLLIMPORT for
-														 * PostGIS */
+extern PGDLLIMPORT int default_statistics_target;	/* PGDLLIMPORT for PostGIS */
 extern int	vacuum_freeze_min_age;
 extern int	vacuum_freeze_table_age;
 extern int	vacuum_multixact_freeze_min_age;
@@ -203,4 +202,4 @@ extern double anl_random_fract(void);
 extern double anl_init_selection_state(int n);
 extern double anl_get_next_S(double t, int n, double *stateptr);
 
-#endif   /* VACUUM_H */
+#endif							/* VACUUM_H */
diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h
index 247423c6fbe..575339a6d8a 100644
--- a/src/include/commands/variable.h
+++ b/src/include/commands/variable.h
@@ -37,4 +37,4 @@ extern bool check_role(char **newval, void **extra, GucSource source);
 extern void assign_role(const char *newval, void *extra);
 extern const char *show_role(void);
 
-#endif   /* VARIABLE_H */
+#endif							/* VARIABLE_H */
diff --git a/src/include/commands/view.h b/src/include/commands/view.h
index 39763913c80..cf08ce2ac71 100644
--- a/src/include/commands/view.h
+++ b/src/include/commands/view.h
@@ -24,4 +24,4 @@ extern ObjectAddress DefineView(ViewStmt *stmt, const char *queryString,
 
 extern void StoreViewQuery(Oid viewOid, Query *viewParse, bool replace);
 
-#endif   /* VIEW_H */
+#endif							/* VIEW_H */