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 e3860ffa4d 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

src/interfaces/ecpg/ecpglib/data.c

@@ -187,7 +187,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 		case ECPGt_unsigned_long_long:
 			*((long long int *) (ind + ind_offset * act_tuple)) = value_for_indicator;
 			break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 		case ECPGt_NO_INDICATOR:
 			if (value_for_indicator == -1)
 			{
@@ -275,7 +275,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						case ECPGt_unsigned_long_long:
 							*((long long int *) (ind + ind_offset * act_tuple)) = size;
 							break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 						default:
 							break;
 					}
@@ -369,7 +369,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					pval = scan_length;
 
 					break;
-#endif   /* HAVE_STRTOLL */
+#endif							/* HAVE_STRTOLL */
 #ifdef HAVE_STRTOULL
 				case ECPGt_unsigned_long_long:
 					*((unsigned long long int *) (var + offset * act_tuple)) = strtoull(pval, &scan_length, 10);
@@ -381,8 +381,8 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					pval = scan_length;
 
 					break;
-#endif   /* HAVE_STRTOULL */
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_STRTOULL */
+#endif							/* HAVE_LONG_LONG_INT */
 
 				case ECPGt_float:
 				case ECPGt_double:
@@ -496,7 +496,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 									case ECPGt_unsigned_long_long:
 										*((long long int *) (ind + ind_offset * act_tuple)) = size;
 										break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 									default:
 										break;
 								}
@@ -541,7 +541,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 									case ECPGt_unsigned_long_long:
 										*((long long int *) (ind + ind_offset * act_tuple)) = variable->len;
 										break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 									default:
 										break;
 								}

src/interfaces/ecpg/ecpglib/descriptor.c

@@ -141,7 +141,7 @@ get_int_item(int lineno, void *var, enum ECPGttype vartype, int value)
 		case ECPGt_unsigned_long_long:
 			*(unsigned long long int *) var = (unsigned long long int) value;
 			break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 		case ECPGt_float:
 			*(float *) var = (float) value;
 			break;
@@ -186,7 +186,7 @@ set_int_item(int lineno, int *target, const void *var, enum ECPGttype vartype)
 		case ECPGt_unsigned_long_long:
 			*target = *(const unsigned long long int *) var;
 			break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 		case ECPGt_float:
 			*target = *(const float *) var;
 			break;
@@ -753,7 +753,7 @@ descriptor_deallocate_all(struct descriptor *list)
 		list = next;
 	}
 }
-#endif   /* ENABLE_THREAD_SAFETY */
+#endif							/* ENABLE_THREAD_SAFETY */
 
 bool
 ECPGallocate_desc(int line, const char *name)
@@ -855,7 +855,7 @@ ECPGdescribe(int line, int compat, bool input, const char *connection_name, cons
 
 		/* rest of variable parameters */
 		ptr = va_arg(args, void *);
-		(void) va_arg(args, long);		/* skip args */
+		(void) va_arg(args, long);	/* skip args */
 		(void) va_arg(args, long);
 		(void) va_arg(args, long);
 

src/interfaces/ecpg/ecpglib/execute.c

@@ -364,7 +364,7 @@ ecpg_store_result(const PGresult *results, int act_field,
 						/* special mode for handling char**foo=0 */
 						for (act_tuple = 0; act_tuple < ntuples; act_tuple++)
 							len += strlen(PQgetvalue(results, act_tuple, act_field)) + 1;
-						len *= var->offset;		/* should be 1, but YMNK */
+						len *= var->offset; /* should be 1, but YMNK */
 						len += (ntuples + 1) * sizeof(char *);
 					}
 					else
@@ -534,7 +534,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
 			if (*(long long int *) var->ind_value < (long long) 0)
 				*tobeinserted_p = NULL;
 			break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 		case ECPGt_NO_INDICATOR:
 			if (force_indicator == false)
 			{
@@ -704,7 +704,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
 
 				*tobeinserted_p = mallocedval;
 				break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 			case ECPGt_float:
 				if (!(mallocedval = ecpg_alloc(asize * 25, lineno)))
 					return false;
@@ -1361,8 +1361,8 @@ ecpg_build_params(struct statement *stmt)
 			if (stmt->command[position] == '?')
 			{
 				/* yes, replace with new style */
-				int			buffersize = sizeof(int) * CHAR_BIT * 10 / 3;		/* a rough guess of the
-																				 * size we need */
+				int			buffersize = sizeof(int) * CHAR_BIT * 10 / 3;	/* a rough guess of the
+																			 * size we need */
 
 				if (!(tobeinserted = (char *) ecpg_alloc(buffersize, stmt->lineno)))
 				{

src/interfaces/ecpg/ecpglib/extern.h

@@ -220,4 +220,4 @@ void		ecpg_set_native_sqlda(int, struct sqlda_struct **, const PGresult *, int,
 #define ECPG_SQLSTATE_ECPG_INTERNAL_ERROR	"YE000"
 #define ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY	"YE001"
 
-#endif   /* _ECPG_LIB_EXTERN_H */
+#endif							/* _ECPG_LIB_EXTERN_H */

src/interfaces/ecpg/ecpglib/misc.c

@@ -23,9 +23,9 @@
 #define LONG_LONG_MIN LLONG_MIN
 #else
 #define LONG_LONG_MIN LONGLONG_MIN
-#endif   /* LLONG_MIN */
-#endif   /* LONG_LONG_MIN */
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* LLONG_MIN */
+#endif							/* LONG_LONG_MIN */
+#endif							/* HAVE_LONG_LONG_INT */
 
 bool		ecpg_internal_regression_mode = false;
 
@@ -344,7 +344,7 @@ ECPGset_noind_null(enum ECPGttype type, void *ptr)
 		case ECPGt_unsigned_long_long:
 			*((long long *) ptr) = LONG_LONG_MIN;
 			break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 		case ECPGt_float:
 			memset((char *) ptr, 0xff, sizeof(float));
 			break;
@@ -417,7 +417,7 @@ ECPGis_noind_null(enum ECPGttype type, void *ptr)
 			if (*((long long *) ptr) == LONG_LONG_MIN)
 				return true;
 			break;
-#endif   /* HAVE_LONG_LONG_INT */
+#endif							/* HAVE_LONG_LONG_INT */
 		case ECPGt_float:
 			return (_check(ptr, sizeof(float)));
 			break;
@@ -481,8 +481,8 @@ win32_pthread_once(volatile pthread_once_t *once, void (*fn) (void))
 		pthread_mutex_unlock(&win32_pthread_once_lock);
 	}
 }
-#endif   /* ENABLE_THREAD_SAFETY */
-#endif   /* WIN32 */
+#endif							/* ENABLE_THREAD_SAFETY */
+#endif							/* WIN32 */
 
 #ifdef ENABLE_NLS
 
@@ -516,7 +516,7 @@ ecpg_gettext(const char *msgid)
 
 	return dgettext(PG_TEXTDOMAIN("ecpglib"), msgid);
 }
-#endif   /* ENABLE_NLS */
+#endif							/* ENABLE_NLS */
 
 struct var_list *ivlist = NULL;
 

src/interfaces/ecpg/ecpglib/pg_type.h

@@ -76,4 +76,4 @@
 #define JSONBOID 3802
 #define INT4RANGEOID		3904
 
-#endif   /* PG_TYPE_H */
+#endif							/* PG_TYPE_H */

src/interfaces/ecpg/ecpglib/prepare.c

@@ -23,8 +23,8 @@ typedef struct
 } stmtCacheEntry;
 
 static int	nextStmtID = 1;
-static const int stmtCacheNBuckets = 2039;		/* # buckets - a prime # */
-static const int stmtCacheEntPerBucket = 8;		/* # entries/bucket		*/
+static const int stmtCacheNBuckets = 2039;	/* # buckets - a prime # */
+static const int stmtCacheEntPerBucket = 8; /* # entries/bucket		*/
 static stmtCacheEntry stmtCacheEntries[16384] = {{0, {0}, 0, 0, 0}};
 
 static bool deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con,
@@ -380,7 +380,7 @@ SearchStmtCache(const char *ecpgQuery)
  *	 OR  negative error code
  */
 static int
-ecpg_freeStmtCacheEntry(int lineno, int compat, int entNo)		/* entry # to free */
+ecpg_freeStmtCacheEntry(int lineno, int compat, int entNo)	/* entry # to free */
 {
 	stmtCacheEntry *entry;
 	struct connection *con;
@@ -416,7 +416,7 @@ ecpg_freeStmtCacheEntry(int lineno, int compat, int entNo)		/* entry # to free *
  */
 static int
 AddStmtToCache(int lineno,		/* line # of statement		*/
-			   const char *stmtID,		/* statement ID				*/
+			   const char *stmtID,	/* statement ID				*/
 			   const char *connection,	/* connection				*/
 			   int compat,		/* compatibility level */
 			   const char *ecpgQuery)	/* query					*/

src/interfaces/ecpg/ecpglib/typename.c

@@ -75,19 +75,19 @@ ecpg_dynamic_type(Oid type)
 		case BOOLOID:
 			return SQL3_BOOLEAN;	/* bool */
 		case INT2OID:
-			return SQL3_SMALLINT;		/* int2 */
+			return SQL3_SMALLINT;	/* int2 */
 		case INT4OID:
 			return SQL3_INTEGER;	/* int4 */
 		case TEXTOID:
-			return SQL3_CHARACTER;		/* text */
+			return SQL3_CHARACTER;	/* text */
 		case FLOAT4OID:
 			return SQL3_REAL;	/* float4 */
 		case FLOAT8OID:
-			return SQL3_DOUBLE_PRECISION;		/* float8 */
+			return SQL3_DOUBLE_PRECISION;	/* float8 */
 		case BPCHAROID:
-			return SQL3_CHARACTER;		/* bpchar */
+			return SQL3_CHARACTER;	/* bpchar */
 		case VARCHAROID:
-			return SQL3_CHARACTER_VARYING;		/* varchar */
+			return SQL3_CHARACTER_VARYING;	/* varchar */
 		case DATEOID:
 			return SQL3_DATE_TIME_TIMESTAMP;	/* date */
 		case TIMEOID:

src/interfaces/ecpg/include/datetime.h

@@ -9,6 +9,6 @@
 #ifndef _ECPGLIB_H
 typedef timestamp dtime_t;
 typedef interval intrvl_t;
-#endif   /* ndef _ECPGLIB_H */
+#endif							/* ndef _ECPGLIB_H */
 
-#endif   /* ndef _ECPG_DATETIME_H */
+#endif							/* ndef _ECPG_DATETIME_H */

src/interfaces/ecpg/include/decimal.h

@@ -8,6 +8,6 @@
 /* source created by ecpg which defines this */
 #ifndef _ECPGLIB_H
 typedef decimal dec_t;
-#endif   /* ndef _ECPGLIB_H */
+#endif							/* ndef _ECPGLIB_H */
 
-#endif   /* ndef _ECPG_DECIMAL_H */
+#endif							/* ndef _ECPG_DECIMAL_H */

src/interfaces/ecpg/include/ecpg-pthread-win32.h

@@ -52,7 +52,7 @@ void		win32_pthread_once(volatile pthread_once_t *once, void (*fn) (void));
 		if (!*(once)) \
 			win32_pthread_once((once), (fn)); \
 	} while(0)
-#endif   /* WIN32 */
-#endif   /* ENABLE_THREAD_SAFETY */
+#endif							/* WIN32 */
+#endif							/* ENABLE_THREAD_SAFETY */
 
-#endif   /* _ECPG_PTHREAD_WIN32_H */
+#endif							/* _ECPG_PTHREAD_WIN32_H */

src/interfaces/ecpg/include/ecpg_informix.h

@@ -87,4 +87,4 @@ extern int	dtcvfmtasc(char *, char *, timestamp *);
 }
 #endif
 
-#endif   /* ndef _ECPG_INFORMIX_H */
+#endif							/* ndef _ECPG_INFORMIX_H */

src/interfaces/ecpg/include/ecpgerrno.h

@@ -76,4 +76,4 @@
  /* WARNING:  BlankPortalAssignName: portal * already exists */
 #define ECPG_WARNING_PORTAL_EXISTS	   -605
 
-#endif   /* !_ECPG_ERRNO_H */
+#endif							/* !_ECPG_ERRNO_H */

src/interfaces/ecpg/include/ecpglib.h

@@ -21,23 +21,23 @@ extern char *ecpg_gettext(const char *msgid) pg_attribute_format_arg(1);
 #ifndef __cplusplus
 #ifndef bool
 #define bool char
-#endif   /* ndef bool */
+#endif							/* ndef bool */
 
 #ifndef true
 #define true	((bool) 1)
-#endif   /* ndef true */
+#endif							/* ndef true */
 #ifndef false
 #define false	((bool) 0)
-#endif   /* ndef false */
-#endif   /* not C++ */
+#endif							/* ndef false */
+#endif							/* not C++ */
 
 #ifndef TRUE
 #define TRUE	1
-#endif   /* TRUE */
+#endif							/* TRUE */
 
 #ifndef FALSE
 #define FALSE	0
-#endif   /* FALSE */
+#endif							/* FALSE */
 
 #ifdef __cplusplus
 extern "C"
@@ -97,4 +97,4 @@ void		ecpg_pthreads_init(void);
 }
 #endif
 
-#endif   /* _ECPGLIB_H */
+#endif							/* _ECPGLIB_H */

src/interfaces/ecpg/include/ecpgtype.h

@@ -103,4 +103,4 @@ enum ECPG_statement_type
 }
 #endif
 
-#endif   /* _ECPGTYPE_H */
+#endif							/* _ECPGTYPE_H */

src/interfaces/ecpg/include/pgtypes_date.h

@@ -28,4 +28,4 @@ extern int	PGTYPESdate_fmt_asc(date, const char *, char *);
 }
 #endif
 
-#endif   /* PGTYPES_DATETIME */
+#endif							/* PGTYPES_DATETIME */

src/interfaces/ecpg/include/pgtypes_interval.h

@@ -21,7 +21,7 @@ typedef long long int int64;
 #endif
 
 #define HAVE_INT64_TIMESTAMP
-#endif   /* C_H */
+#endif							/* C_H */
 
 typedef struct
 {
@@ -44,4 +44,4 @@ extern int	PGTYPESinterval_copy(interval *, interval *);
 }
 #endif
 
-#endif   /* PGTYPES_INTERVAL */
+#endif							/* PGTYPES_INTERVAL */

src/interfaces/ecpg/include/pgtypes_numeric.h

@@ -31,7 +31,7 @@ typedef struct
 	int			rscale;			/* result scale */
 	int			dscale;			/* display scale */
 	int			sign;			/* NUMERIC_POS, NUMERIC_NEG, or NUMERIC_NAN */
-	NumericDigit digits[DECSIZE];		/* decimal digits */
+	NumericDigit digits[DECSIZE];	/* decimal digits */
 } decimal;
 
 #ifdef __cplusplus
@@ -64,4 +64,4 @@ int			PGTYPESnumeric_from_decimal(decimal *, numeric *);
 }
 #endif
 
-#endif   /* PGTYPES_NUMERIC */
+#endif							/* PGTYPES_NUMERIC */

src/interfaces/ecpg/include/pgtypes_timestamp.h

@@ -27,4 +27,4 @@ extern int	PGTYPEStimestamp_sub_interval(timestamp * tin, interval * span, times
 }
 #endif
 
-#endif   /* PGTYPES_TIMESTAMP */
+#endif							/* PGTYPES_TIMESTAMP */

src/interfaces/ecpg/include/sql3types.h

@@ -40,4 +40,4 @@ enum
 								 * standard) */
 };
 
-#endif   /* !_ECPG_SQL3TYPES_H */
+#endif							/* !_ECPG_SQL3TYPES_H */

src/interfaces/ecpg/include/sqlca.h

@@ -6,8 +6,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/include/sqlda-compat.h

@@ -40,8 +40,8 @@ struct sqlda_compat
 	struct sqlvar_compat *sqlvar;
 	char		desc_name[19];	/* descriptor name				*/
 	short		desc_occ;		/* size of sqlda structure		*/
-	struct sqlda_compat *desc_next;		/* pointer to next sqlda struct */
+	struct sqlda_compat *desc_next; /* pointer to next sqlda struct */
 	void	   *reserved;		/* reserved for future use */
 };
 
-#endif   /* ECPG_SQLDA_COMPAT_H */
+#endif							/* ECPG_SQLDA_COMPAT_H */

src/interfaces/ecpg/include/sqlda-native.h

@@ -40,4 +40,4 @@ struct sqlda_struct
 	struct sqlvar_struct sqlvar[1];
 };
 
-#endif   /* ECPG_SQLDA_NATIVE_H */
+#endif							/* ECPG_SQLDA_NATIVE_H */

src/interfaces/ecpg/include/sqlda.h

@@ -15,4 +15,4 @@ typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif   /* ECPG_SQLDA_H */
+#endif							/* ECPG_SQLDA_H */

src/interfaces/ecpg/include/sqltypes.h

@@ -54,4 +54,4 @@
 #define SQLSERIAL8	ECPGt_long
 #endif
 
-#endif   /* ndef ECPG_SQLTYPES_H */
+#endif							/* ndef ECPG_SQLTYPES_H */

src/interfaces/ecpg/pgtypeslib/datetime.c

@@ -156,8 +156,8 @@ PGTYPESdate_today(date * d)
 	return;
 }
 
-#define PGTYPES_DATE_NUM_MAX_DIGITS		20		/* should suffice for most
-												 * years... */
+#define PGTYPES_DATE_NUM_MAX_DIGITS		20	/* should suffice for most
+											 * years... */
 
 #define PGTYPES_FMTDATE_DAY_DIGITS_LZ		1	/* LZ means "leading zeroes" */
 #define PGTYPES_FMTDATE_DOW_LITERAL_SHORT	2

src/interfaces/ecpg/pgtypeslib/dt.h

@@ -338,4 +338,4 @@ extern char *months[];
 extern char *days[];
 extern int	day_tab[2][13];
 
-#endif   /* DT_H */
+#endif							/* DT_H */

src/interfaces/ecpg/pgtypeslib/dt_common.c

@@ -30,7 +30,7 @@ static datetkn datetktbl[] = {
 	{"ahst", TZ, -36000},		/* Alaska-Hawaii Std Time */
 	{"akdt", DTZ, -28800},		/* Alaska Daylight Time */
 	{"akst", DTZ, -32400},		/* Alaska Standard Time */
-	{"allballs", RESERV, DTK_ZULU},		/* 00:00:00 */
+	{"allballs", RESERV, DTK_ZULU}, /* 00:00:00 */
 	{"almst", TZ, 25200},		/* Almaty Savings Time */
 	{"almt", TZ, 21600},		/* Almaty Time */
 	{"am", AMPM, AM},
@@ -201,12 +201,12 @@ static datetkn datetktbl[] = {
 	idt							/* Israeli, Iran, Indian Daylight Time */
 #endif
 	{LATE, RESERV, DTK_LATE},	/* "infinity" reserved for "late time" */
-	{INVALID, RESERV, DTK_INVALID},		/* "invalid" reserved for bad time */
+	{INVALID, RESERV, DTK_INVALID}, /* "invalid" reserved for bad time */
 	{"iot", TZ, 18000},			/* Indian Chagos Time */
 	{"irkst", DTZ, 32400},		/* Irkutsk Summer Time */
 	{"irkt", TZ, 28800},		/* Irkutsk Time */
 	{"irt", TZ, 12600},			/* Iran Time */
-	{"isodow", UNITS, DTK_ISODOW},		/* ISO day of week, Sunday == 7 */
+	{"isodow", UNITS, DTK_ISODOW},	/* ISO day of week, Sunday == 7 */
 #if 0
 	isst
 #endif
@@ -425,33 +425,33 @@ static datetkn deltatktbl[] = {
 	{"@", IGNORE_DTF, 0},		/* postgres relative prefix */
 	{DAGO, AGO, 0},				/* "ago" indicates negative time offset */
 	{"c", UNITS, DTK_CENTURY},	/* "century" relative */
-	{"cent", UNITS, DTK_CENTURY},		/* "century" relative */
+	{"cent", UNITS, DTK_CENTURY},	/* "century" relative */
 	{"centuries", UNITS, DTK_CENTURY},	/* "centuries" relative */
-	{DCENTURY, UNITS, DTK_CENTURY},		/* "century" relative */
+	{DCENTURY, UNITS, DTK_CENTURY}, /* "century" relative */
 	{"d", UNITS, DTK_DAY},		/* "day" relative */
 	{DDAY, UNITS, DTK_DAY},		/* "day" relative */
 	{"days", UNITS, DTK_DAY},	/* "days" relative */
 	{"dec", UNITS, DTK_DECADE}, /* "decade" relative */
-	{DDECADE, UNITS, DTK_DECADE},		/* "decade" relative */
-	{"decades", UNITS, DTK_DECADE},		/* "decades" relative */
+	{DDECADE, UNITS, DTK_DECADE},	/* "decade" relative */
+	{"decades", UNITS, DTK_DECADE}, /* "decades" relative */
 	{"decs", UNITS, DTK_DECADE},	/* "decades" relative */
 	{"h", UNITS, DTK_HOUR},		/* "hour" relative */
 	{DHOUR, UNITS, DTK_HOUR},	/* "hour" relative */
 	{"hours", UNITS, DTK_HOUR}, /* "hours" relative */
 	{"hr", UNITS, DTK_HOUR},	/* "hour" relative */
 	{"hrs", UNITS, DTK_HOUR},	/* "hours" relative */
-	{INVALID, RESERV, DTK_INVALID},		/* reserved for invalid time */
+	{INVALID, RESERV, DTK_INVALID}, /* reserved for invalid time */
 	{"m", UNITS, DTK_MINUTE},	/* "minute" relative */
-	{"microsecon", UNITS, DTK_MICROSEC},		/* "microsecond" relative */
-	{"mil", UNITS, DTK_MILLENNIUM},		/* "millennium" relative */
-	{"millennia", UNITS, DTK_MILLENNIUM},		/* "millennia" relative */
-	{DMILLENNIUM, UNITS, DTK_MILLENNIUM},		/* "millennium" relative */
-	{"millisecon", UNITS, DTK_MILLISEC},		/* relative */
+	{"microsecon", UNITS, DTK_MICROSEC},	/* "microsecond" relative */
+	{"mil", UNITS, DTK_MILLENNIUM}, /* "millennium" relative */
+	{"millennia", UNITS, DTK_MILLENNIUM},	/* "millennia" relative */
+	{DMILLENNIUM, UNITS, DTK_MILLENNIUM},	/* "millennium" relative */
+	{"millisecon", UNITS, DTK_MILLISEC},	/* relative */
 	{"mils", UNITS, DTK_MILLENNIUM},	/* "millennia" relative */
 	{"min", UNITS, DTK_MINUTE}, /* "minute" relative */
 	{"mins", UNITS, DTK_MINUTE},	/* "minutes" relative */
-	{DMINUTE, UNITS, DTK_MINUTE},		/* "minute" relative */
-	{"minutes", UNITS, DTK_MINUTE},		/* "minutes" relative */
+	{DMINUTE, UNITS, DTK_MINUTE},	/* "minute" relative */
+	{"minutes", UNITS, DTK_MINUTE}, /* "minutes" relative */
 	{"mon", UNITS, DTK_MONTH},	/* "months" relative */
 	{"mons", UNITS, DTK_MONTH}, /* "months" relative */
 	{DMONTH, UNITS, DTK_MONTH}, /* "month" relative */
@@ -462,7 +462,7 @@ static datetkn deltatktbl[] = {
 	{"mseconds", UNITS, DTK_MILLISEC},
 	{"msecs", UNITS, DTK_MILLISEC},
 	{"qtr", UNITS, DTK_QUARTER},	/* "quarter" relative */
-	{DQUARTER, UNITS, DTK_QUARTER},		/* "quarter" relative */
+	{DQUARTER, UNITS, DTK_QUARTER}, /* "quarter" relative */
 	{"s", UNITS, DTK_SECOND},
 	{"sec", UNITS, DTK_SECOND},
 	{DSECOND, UNITS, DTK_SECOND},
@@ -470,13 +470,13 @@ static datetkn deltatktbl[] = {
 	{"secs", UNITS, DTK_SECOND},
 	{DTIMEZONE, UNITS, DTK_TZ}, /* "timezone" time offset */
 	{"timezone_h", UNITS, DTK_TZ_HOUR}, /* timezone hour units */
-	{"timezone_m", UNITS, DTK_TZ_MINUTE},		/* timezone minutes units */
+	{"timezone_m", UNITS, DTK_TZ_MINUTE},	/* timezone minutes units */
 	{"undefined", RESERV, DTK_INVALID}, /* pre-v6.1 invalid time */
 	{"us", UNITS, DTK_MICROSEC},	/* "microsecond" relative */
-	{"usec", UNITS, DTK_MICROSEC},		/* "microsecond" relative */
+	{"usec", UNITS, DTK_MICROSEC},	/* "microsecond" relative */
 	{DMICROSEC, UNITS, DTK_MICROSEC},	/* "microsecond" relative */
 	{"useconds", UNITS, DTK_MICROSEC},	/* "microseconds" relative */
-	{"usecs", UNITS, DTK_MICROSEC},		/* "microseconds" relative */
+	{"usecs", UNITS, DTK_MICROSEC}, /* "microseconds" relative */
 	{"w", UNITS, DTK_WEEK},		/* "week" relative */
 	{DWEEK, UNITS, DTK_WEEK},	/* "week" relative */
 	{"weeks", UNITS, DTK_WEEK}, /* "weeks" relative */

src/interfaces/ecpg/pgtypeslib/extern.h

@@ -11,13 +11,12 @@
 #define PGTYPES_TYPE_STRING_MALLOCED		1
 #define PGTYPES_TYPE_STRING_CONSTANT		2
 #define PGTYPES_TYPE_CHAR			3
-#define PGTYPES_TYPE_DOUBLE_NF			4		/* no fractional part */
+#define PGTYPES_TYPE_DOUBLE_NF			4	/* no fractional part */
 #define PGTYPES_TYPE_INT64			5
 #define PGTYPES_TYPE_UINT			6
-#define PGTYPES_TYPE_UINT_2_LZ			7		/* 2 digits, pad with leading
-												 * zero */
-#define PGTYPES_TYPE_UINT_2_LS			8		/* 2 digits, pad with leading
-												 * space */
+#define PGTYPES_TYPE_UINT_2_LZ			7	/* 2 digits, pad with leading zero */
+#define PGTYPES_TYPE_UINT_2_LS			8	/* 2 digits, pad with leading
+											 * space */
 #define PGTYPES_TYPE_UINT_3_LZ			9
 #define PGTYPES_TYPE_UINT_4_LZ			10
 #define PGTYPES_TYPE_UINT_LONG			11
@@ -41,14 +40,14 @@ char	   *pgtypes_strdup(const char *);
 
 #ifndef bool
 #define bool char
-#endif   /* ndef bool */
+#endif							/* ndef bool */
 
 #ifndef FALSE
 #define FALSE	0
-#endif   /* FALSE */
+#endif							/* FALSE */
 
 #ifndef TRUE
 #define TRUE	   1
-#endif   /* TRUE */
+#endif							/* TRUE */
 
-#endif   /* __PGTYPES_COMMON_H__ */
+#endif							/* __PGTYPES_COMMON_H__ */

src/interfaces/ecpg/pgtypeslib/interval.c

@@ -335,7 +335,7 @@ DecodeISO8601Interval(char *str,
  *	* Assert wasn't available so removed it.
  */
 int
-DecodeInterval(char **field, int *ftype, int nf,		/* int range, */
+DecodeInterval(char **field, int *ftype, int nf,	/* int range, */
 			   int *dtype, struct /* pg_ */ tm *tm, fsec_t *fsec)
 {
 	int			IntervalStyle = INTSTYLE_POSTGRES_VERBOSE;

src/interfaces/ecpg/pgtypeslib/timestamp.c

@@ -152,7 +152,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t
 			tm->tm_gmtoff = tx->tm_gmtoff;
 			tm->tm_zone = tx->tm_zone;
 
-			*tzp = -tm->tm_gmtoff;		/* tm_gmtoff is Sun/DEC-ism */
+			*tzp = -tm->tm_gmtoff;	/* tm_gmtoff is Sun/DEC-ism */
 			if (tzn != NULL)
 				*tzn = tm->tm_zone;
 #elif defined(HAVE_INT_TIMEZONE)

src/interfaces/ecpg/preproc/extern.h

@@ -128,4 +128,4 @@ extern enum COMPAT_MODE compat;
 
 #define INFORMIX_MODE	(compat == ECPG_COMPAT_INFORMIX || compat == ECPG_COMPAT_INFORMIX_SE)
 
-#endif   /* _ECPG_PREPROC_EXTERN_H */
+#endif							/* _ECPG_PREPROC_EXTERN_H */

src/interfaces/ecpg/preproc/output.c

@@ -228,8 +228,8 @@ output_escaped_str(char *str, bool quoted)
 				j++;
 			} while (str[j] == ' ' || str[j] == '\t');
 
-			if ((str[j] != '\n') && (str[j] != '\r' || str[j + 1] != '\n'))		/* not followed by a
-																				 * newline */
+			if ((str[j] != '\n') && (str[j] != '\r' || str[j + 1] != '\n')) /* not followed by a
+																			 * newline */
 				fputs("\\\\", base_yyout);
 		}
 		else if (str[i] == '\r' && str[i + 1] == '\n')

src/interfaces/ecpg/preproc/type.c

@@ -178,7 +178,7 @@ get_type(enum ECPGttype type)
 		case ECPGt_NO_INDICATOR:	/* no indicator */
 			return ("ECPGt_NO_INDICATOR");
 			break;
-		case ECPGt_char_variable:		/* string that should not be quoted */
+		case ECPGt_char_variable:	/* string that should not be quoted */
 			return ("ECPGt_char_variable");
 			break;
 		case ECPGt_const:		/* constant string quoted */

src/interfaces/ecpg/preproc/type.h

@@ -25,10 +25,9 @@ struct ECPGtype
 								 * string */
 	union
 	{
-		struct ECPGtype *element;		/* For an array this is the type of
-										 * the element */
-		struct ECPGstruct_member *members;		/* A pointer to a list of
-												 * members. */
+		struct ECPGtype *element;	/* For an array this is the type of the
+									 * element */
+		struct ECPGstruct_member *members;	/* A pointer to a list of members. */
 	}			u;
 	int			counter;
 };
@@ -195,4 +194,4 @@ struct fetch_desc
 	char	   *name;
 };
 
-#endif   /* _ECPG_PREPROC_TYPE_H */
+#endif							/* _ECPG_PREPROC_TYPE_H */

src/interfaces/ecpg/test/expected/compat_informix-describe.c

@@ -41,7 +41,7 @@ typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif   /* ECPG_SQLDA_H */
+#endif							/* ECPG_SQLDA_H */
 
 #line 5 "describe.pgc"
 

src/interfaces/ecpg/test/expected/compat_informix-sqlda.c

@@ -43,7 +43,7 @@ typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif   /* ECPG_SQLDA_H */
+#endif							/* ECPG_SQLDA_H */
 
 #line 7 "sqlda.pgc"
 
@@ -105,7 +105,7 @@ typedef struct sqlda_struct sqlda_t;
 #define SQLSERIAL8	ECPGt_long
 #endif
 
-#endif   /* ndef ECPG_SQLTYPES_H */
+#endif							/* ndef ECPG_SQLTYPES_H */
 
 #line 8 "sqlda.pgc"
 

src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c

@@ -23,8 +23,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/preproc-init.c

@@ -17,8 +17,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/preproc-outofscope.c

@@ -58,7 +58,7 @@ typedef struct
 	int			rscale;			/* result scale */
 	int			dscale;			/* display scale */
 	int			sign;			/* NUMERIC_POS, NUMERIC_NEG, or NUMERIC_NAN */
-	NumericDigit digits[DECSIZE];		/* decimal digits */
+	NumericDigit digits[DECSIZE];	/* decimal digits */
 } decimal;
 
 #ifdef __cplusplus
@@ -91,7 +91,7 @@ int			PGTYPESnumeric_from_decimal(decimal *, numeric *);
 }
 #endif
 
-#endif   /* PGTYPES_NUMERIC */
+#endif							/* PGTYPES_NUMERIC */
 
 #line 8 "outofscope.pgc"
 

src/interfaces/ecpg/test/expected/sql-array.c

@@ -30,8 +30,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/sql-code100.c

@@ -17,8 +17,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/sql-copystdout.c

@@ -19,8 +19,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/sql-define.c

@@ -17,8 +17,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/sql-describe.c

@@ -39,7 +39,7 @@ typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif   /* ECPG_SQLDA_H */
+#endif							/* ECPG_SQLDA_H */
 
 #line 5 "describe.pgc"
 

src/interfaces/ecpg/test/expected/sql-dynalloc.c

@@ -18,8 +18,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/sql-dynalloc2.c

@@ -18,8 +18,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/sql-dyntest.c

@@ -57,7 +57,7 @@ enum
 								 * standard) */
 };
 
-#endif   /* !_ECPG_SQL3TYPES_H */
+#endif							/* !_ECPG_SQL3TYPES_H */
 
 #line 7 "dyntest.pgc"
 
@@ -71,8 +71,8 @@ enum
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/sql-indicators.c

@@ -19,8 +19,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/sql-sqlda.c

@@ -41,7 +41,7 @@ typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif   /* ECPG_SQLDA_H */
+#endif							/* ECPG_SQLDA_H */
 
 #line 7 "sqlda.pgc"
 
@@ -80,7 +80,7 @@ typedef struct
 	int			rscale;			/* result scale */
 	int			dscale;			/* display scale */
 	int			sign;			/* NUMERIC_POS, NUMERIC_NEG, or NUMERIC_NAN */
-	NumericDigit digits[DECSIZE];		/* decimal digits */
+	NumericDigit digits[DECSIZE];	/* decimal digits */
 } decimal;
 
 #ifdef __cplusplus
@@ -113,7 +113,7 @@ int			PGTYPESnumeric_from_decimal(decimal *, numeric *);
 }
 #endif
 
-#endif   /* PGTYPES_NUMERIC */
+#endif							/* PGTYPES_NUMERIC */
 
 #line 8 "sqlda.pgc"
 

src/interfaces/ecpg/test/expected/thread-alloc.c

@@ -40,8 +40,8 @@ main(void)
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/thread-descriptor.c

@@ -31,8 +31,8 @@
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150
 

src/interfaces/ecpg/test/expected/thread-prep.c

@@ -40,8 +40,8 @@ main(void)
 #define PGDLLIMPORT __declspec (dllimport)
 #else
 #define PGDLLIMPORT
-#endif   /* __CYGWIN__ */
-#endif   /* PGDLLIMPORT */
+#endif							/* __CYGWIN__ */
+#endif							/* PGDLLIMPORT */
 
 #define SQLERRMC_LEN	150