Re-run pgindent, fixing a problem where comment lines after a blank

comment line where output as too long, and update typedefs for /lib
directory.  Also fix case where identifiers were used as variable names
in the backend, but as typedefs in ecpg (favor the backend for
indenting).

Backpatch to 8.1.X.

Author: bmomjian

contrib/dblink/dblink.c

@@ -60,9 +60,9 @@
 
 typedef struct remoteConn
 {
-	PGconn	   *conn;				/* Hold the remote connection */
+	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;
 
 /*
@@ -85,8 +85,8 @@ static Oid	get_relid_from_relname(text *relname_text);
 static char *generate_relation_name(Oid relid);
 
 /* Global */
-static remoteConn	   *pconn = NULL;
-static HTAB			   *remoteConnHash = NULL;
+static remoteConn *pconn = NULL;
+static HTAB *remoteConnHash = NULL;
 
 /*
  *	Following is list that holds multiple remote connections.
@@ -347,7 +347,7 @@ dblink_open(PG_FUNCTION_ARGS)
 	else
 		conn = rconn->conn;
 
-	/*	If we are not in a transaction, start one */
+	/* If we are not in a transaction, start one */
 	if (PQtransactionStatus(conn) == PQTRANS_IDLE)
 	{
 		res = PQexec(conn, "BEGIN");
@@ -1505,7 +1505,7 @@ get_text_array_contents(ArrayType *array, int *numitems)
 		else
 		{
 			values[i] = DatumGetCString(DirectFunctionCall1(textout,
-														PointerGetDatum(ptr)));
+													  PointerGetDatum(ptr)));
 			ptr = att_addlength(ptr, typlen, PointerGetDatum(ptr));
 			ptr = (char *) att_align(ptr, typalign);
 		}
@@ -1717,7 +1717,7 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
 			key = -1;
 
 		if (key > -1)
-			val = tgt_pkattvals[key] ?  pstrdup(tgt_pkattvals[key]) : NULL;
+			val = tgt_pkattvals[key] ? pstrdup(tgt_pkattvals[key]) : NULL;
 		else
 			val = SPI_getvalue(tuple, tupdesc, i + 1);
 
@@ -1744,7 +1744,7 @@ get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pka
 		   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname)));
 
 		if (tgt_pkattvals != NULL)
-			val = tgt_pkattvals[i] ?  pstrdup(tgt_pkattvals[i]) : NULL;
+			val = tgt_pkattvals[i] ? pstrdup(tgt_pkattvals[i]) : NULL;
 		else
 			val = SPI_getvalue(tuple, tupdesc, pkattnum);
 

contrib/intarray/_int_gist.c

@@ -39,7 +39,7 @@ g_int_consistent(PG_FUNCTION_ARGS)
 	if (strategy == BooleanSearchStrategy)
 		PG_RETURN_BOOL(execconsistent((QUERYTYPE *) query,
 								   (ArrayType *) DatumGetPointer(entry->key),
-					  GIST_LEAF(entry)));
+									  GIST_LEAF(entry)));
 
 	/* XXX are we sure it's safe to scribble on the query object here? */
 	/* XXX what about toasted input? */
@@ -97,7 +97,7 @@ g_int_union(PG_FUNCTION_ARGS)
 
 	for (i = 0; i < entryvec->n; i++)
 	{
-		ArrayType *ent = GETENTRY(entryvec, i);
+		ArrayType  *ent = GETENTRY(entryvec, i);
 
 		CHECKARRVALID(ent);
 		totlen += ARRNELEMS(ent);
@@ -108,8 +108,8 @@ g_int_union(PG_FUNCTION_ARGS)
 
 	for (i = 0; i < entryvec->n; i++)
 	{
-		ArrayType *ent = GETENTRY(entryvec, i);
-		int nel;
+		ArrayType  *ent = GETENTRY(entryvec, i);
+		int			nel;
 
 		nel = ARRNELEMS(ent);
 		memcpy(ptr, ARRPTR(ent), nel * sizeof(int4));
@@ -143,23 +143,25 @@ g_int_compress(PG_FUNCTION_ARGS)
 		CHECKARRVALID(r);
 		PREPAREARR(r);
 
-		if (ARRNELEMS(r)>= 2 * MAXNUMRANGE)
-			elog(NOTICE,"Input array is too big (%d maximum allowed, %d current), use gist__intbig_ops opclass instead",
-				2 * MAXNUMRANGE - 1, ARRNELEMS(r)); 
-			
+		if (ARRNELEMS(r) >= 2 * MAXNUMRANGE)
+			elog(NOTICE, "Input array is too big (%d maximum allowed, %d current), use gist__intbig_ops opclass instead",
+				 2 * MAXNUMRANGE - 1, ARRNELEMS(r));
+
 		retval = palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(r),
 				  entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
 
 		PG_RETURN_POINTER(retval);
 	}
 
-	/* leaf entries never compress one more time, only when entry->leafkey ==true,
-           so now we work only with internal keys  */
+	/*
+	 * leaf entries never compress one more time, only when entry->leafkey
+	 * ==true, so now we work only with internal keys
+	 */
 
 	r = (ArrayType *) PG_DETOAST_DATUM(entry->key);
 	CHECKARRVALID(r);
-	if (ARRISVOID(r)) 
+	if (ARRISVOID(r))
 	{
 		if (r != (ArrayType *) DatumGetPointer(entry->key))
 			pfree(r);

contrib/pgbench/pgbench.c

@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.45 2005/10/29 19:38:07 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.46 2005/11/22 18:17:04 momjian Exp $
  *
  * pgbench: a simple benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -1110,7 +1110,8 @@ main(int argc, char **argv)
 					fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
 					exit(1);
 				}
-#endif   /* #if !(defined(__CYGWIN__) || defined(__MINGW32__)) */
+#endif   /* #if !(defined(__CYGWIN__) ||
+								 * defined(__MINGW32__)) */
 				break;
 			case 'C':
 				is_connect = 1;

contrib/pgcrypto/pgp-decrypt.c

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.6 2005/10/15 02:49:06 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.7 2005/11/22 18:17:04 momjian Exp $
  */
 
 #include "postgres.h"
@@ -269,14 +269,14 @@ prefix_init(void **priv_p, void *arg, PullFilter * src)
 		 * The original purpose of the 2-byte check was to show user a
 		 * friendly "wrong key" message. This made following possible:
 		 *
-		 * "An Attack on CFB Mode Encryption As Used By OpenPGP" by Serge Mister
-		 * and Robert Zuccherato
+		 * "An Attack on CFB Mode Encryption As Used By OpenPGP" by Serge
+		 * Mister and Robert Zuccherato
 		 *
-		 * To avoid being 'oracle', we delay reporting, which basically means we
-		 * prefer to run into corrupt packet header.
+		 * To avoid being 'oracle', we delay reporting, which basically means
+		 * we prefer to run into corrupt packet header.
 		 *
-		 * We _could_ throw PXE_PGP_CORRUPT_DATA here, but there is possibility
-		 * of attack via timing, so we don't.
+		 * We _could_ throw PXE_PGP_CORRUPT_DATA here, but there is
+		 * possibility of attack via timing, so we don't.
 		 */
 		ctx->corrupt_prefix = 1;
 	}

contrib/pgcrypto/pgp-pgsql.c

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pgsql.c,v 1.6 2005/10/15 02:49:06 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pgsql.c,v 1.7 2005/11/22 18:17:04 momjian Exp $
  */
 
 #include "postgres.h"
@@ -125,8 +125,8 @@ add_entropy(text *data1, text *data2, text *data3)
 	/*
 	 * Try to make the feeding unpredictable.
 	 *
-	 * Prefer data over keys, as it's rather likely that key is same in several
-	 * calls.
+	 * Prefer data over keys, as it's rather likely that key is same in
+	 * several calls.
 	 */
 
 	/* chance: 7/8 */

contrib/tablefunc/tablefunc.c

@@ -547,8 +547,8 @@ crosstab(PG_FUNCTION_ARGS)
 					 * Get the next category item value, which is alway
 					 * attribute number three.
 					 *
-					 * Be careful to sssign the value to the array index based on
-					 * which category we are presently processing.
+					 * Be careful to sssign the value to the array index based
+					 * on which category we are presently processing.
 					 */
 					values[1 + i] = SPI_getvalue(spi_tuple, spi_tupdesc, 3);
 
@@ -870,8 +870,8 @@ get_crosstab_tuplestore(char *sql,
 		/*
 		 * The provided SQL query must always return at least three columns:
 		 *
-		 * 1. rowname	the label for each row - column 1 in the final result 2.
-		 * category  the label for each value-column in the final result 3.
+		 * 1. rowname	the label for each row - column 1 in the final result
+		 * 2. category	the label for each value-column in the final result 3.
 		 * value	 the values used to populate the value-columns
 		 *
 		 * If there are more than three columns, the last two are taken as

contrib/tsearch2/query.c

@@ -178,7 +178,7 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval, int2
 						state->state = WAITOPERATOR;
 						return VAL;
 					}
-					else if ( state->state == WAITFIRSTOPERAND ) 
+					else if (state->state == WAITFIRSTOPERAND)
 						return END;
 					else
 						ereport(ERROR,
@@ -206,13 +206,13 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval, int2
 					return ERR;
 				break;
 			case WAITSINGLEOPERAND:
-				if ( *(state->buf) == '\0' ) 
+				if (*(state->buf) == '\0')
 					return END;
 				*strval = state->buf;
-				*lenval = strlen( state->buf );
-				state->buf += strlen( state->buf );
+				*lenval = strlen(state->buf);
+				state->buf += strlen(state->buf);
 				state->count++;
-				return VAL;	
+				return VAL;
 			default:
 				return ERR;
 				break;
@@ -600,7 +600,7 @@ findoprnd(ITEM * ptr, int4 *pos)
  * input
  */
 static QUERYTYPE *
-queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int, int2), int cfg_id, bool isplain)
+			queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int, int2), int cfg_id, bool isplain)
 {
 	QPRS_STATE	state;
 	int4		i;
@@ -637,12 +637,13 @@ queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int, int2), int c
 	/* parse query & make polish notation (postfix, but in reverse order) */
 	makepol(&state, pushval);
 	pfree(state.valstate.word);
-	if (!state.num) {
+	if (!state.num)
+	{
 		elog(NOTICE, "Query doesn't contain lexem(s)");
-		query = (QUERYTYPE*)palloc( HDRSIZEQT );
+		query = (QUERYTYPE *) palloc(HDRSIZEQT);
 		query->len = HDRSIZEQT;
 		query->size = 0;
-		return query; 
+		return query;
 	}
 
 	/* make finish struct */
@@ -928,9 +929,9 @@ to_tsquery(PG_FUNCTION_ARGS)
 	str = text2char(in);
 	PG_FREE_IF_COPY(in, 1);
 
-	query = queryin(str, pushval_morph, PG_GETARG_INT32(0),false);
-	
-	if ( query->size == 0 )
+	query = queryin(str, pushval_morph, PG_GETARG_INT32(0), false);
+
+	if (query->size == 0)
 		PG_RETURN_POINTER(query);
 
 	res = clean_fakeval_v2(GETQUERY(query), &len);
@@ -984,8 +985,8 @@ plainto_tsquery(PG_FUNCTION_ARGS)
 	PG_FREE_IF_COPY(in, 1);
 
 	query = queryin(str, pushval_morph, PG_GETARG_INT32(0), true);
-	
-	if ( query->size == 0 )
+
+	if (query->size == 0)
 		PG_RETURN_POINTER(query);
 
 	res = clean_fakeval_v2(GETQUERY(query), &len);
@@ -1023,4 +1024,3 @@ plainto_tsquery_current(PG_FUNCTION_ARGS)
 										Int32GetDatum(get_currcfg()),
 										PG_GETARG_DATUM(0)));
 }
-

contrib/tsearch2/query.h

@@ -17,7 +17,7 @@ typedef struct ITEM
 	int4		val;
 	/* user-friendly value, must correlate with WordEntry */
 	uint32
-				istrue:1, /* use for ranking in Cover */
+				istrue:1,		/* use for ranking in Cover */
 				length:11,
 				distance:20;
 }	ITEM;