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.

1 files changed, 11 insertions, 10 deletions

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 81463abba83..e9ac17d148b 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.196 2005/11/20 19:49:07 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.197 2005/11/22 18:17:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -566,8 +566,8 @@ RemoveTriggerById(Oid trigOid)
 	 * (and this one too!) are sent SI message to make them rebuild relcache
 	 * entries.
 	 *
-	 * Note this is OK only because we have AccessExclusiveLock on the rel, so no
-	 * one else is creating/deleting triggers on this rel at the same time.
+	 * Note this is OK only because we have AccessExclusiveLock on the rel, so
+	 * no one else is creating/deleting triggers on this rel at the same time.
 	 */
 	pgrel = heap_open(RelationRelationId, RowExclusiveLock);
 	tuple = SearchSysCacheCopy(RELOID,
@@ -1182,8 +1182,8 @@ equalTriggerDescs(TriggerDesc *trigdesc1, TriggerDesc *trigdesc2)
 	 * we have the same triggers with the same types, the derived index data
 	 * should match.
 	 *
-	 * As of 7.3 we assume trigger set ordering is significant in the comparison;
-	 * so we just compare corresponding slots of the two sets.
+	 * As of 7.3 we assume trigger set ordering is significant in the
+	 * comparison; so we just compare corresponding slots of the two sets.
 	 */
 	if (trigdesc1 != NULL)
 	{
@@ -2533,13 +2533,14 @@ AfterTriggerEndQuery(EState *estate)
 	 * Process all immediate-mode triggers queued by the query, and move the
 	 * deferred ones to the main list of deferred events.
 	 *
-	 * Notice that we decide which ones will be fired, and put the deferred ones
-	 * on the main list, before anything is actually fired.  This ensures
+	 * Notice that we decide which ones will be fired, and put the deferred
+	 * ones on the main list, before anything is actually fired.  This ensures
 	 * reasonably sane behavior if a trigger function does SET CONSTRAINTS ...
 	 * IMMEDIATE: all events we have decided to defer will be available for it
 	 * to fire.
 	 *
-	 * If we find no firable events, we don't have to increment firing_counter.
+	 * If we find no firable events, we don't have to increment
+	 * firing_counter.
 	 */
 	events = &afterTriggers->query_stack[afterTriggers->query_depth];
 	if (afterTriggerMarkEvents(events, &afterTriggers->events, true))
@@ -3026,8 +3027,8 @@ AfterTriggerSetState(ConstraintsSetStmt *stmt)
 	 * list of previously deferred events to fire any that have now become
 	 * immediate.
 	 *
-	 * Obviously, if this was SET ... DEFERRED then it can't have converted any
-	 * unfired events to immediate, so we need do nothing in that case.
+	 * Obviously, if this was SET ... DEFERRED then it can't have converted
+	 * any unfired events to immediate, so we need do nothing in that case.
 	 */
 	if (!stmt->deferred)
 	{