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.

3 files changed, 30 insertions, 29 deletions

diff --git a/src/backend/utils/init/flatfiles.c b/src/backend/utils/init/flatfiles.c
index 9906682c320..eca3182d746 100644
--- a/src/backend/utils/init/flatfiles.c
+++ b/src/backend/utils/init/flatfiles.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.15 2005/10/15 02:49:33 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.15.2.1 2005/11/22 18:23:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -593,8 +593,8 @@ write_auth_file(Relation rel_authid, Relation rel_authmem)
 			 * Convert list of role Oids to list of role names. We must do
 			 * this before re-sorting auth_info.
 			 *
-			 * We skip the first list element (curr_role itself) since there is
-			 * no point in writing that a role is a member of itself.
+			 * We skip the first list element (curr_role itself) since there
+			 * is no point in writing that a role is a member of itself.
 			 */
 			for_each_cell(mem, lnext(list_head(roles_list)))
 			{
@@ -775,8 +775,8 @@ AtEOXact_UpdateFlatFiles(bool isCommit)
 	 * likely won't have gotten a strong enough lock), so get the locks we
 	 * need before writing anything.
 	 *
-	 * For writing the auth file, it's sufficient to ExclusiveLock pg_authid; we
-	 * take just regular AccessShareLock on pg_auth_members.
+	 * For writing the auth file, it's sufficient to ExclusiveLock pg_authid;
+	 * we take just regular AccessShareLock on pg_auth_members.
 	 */
 	if (database_file_update_subid != InvalidSubTransactionId)
 		drel = heap_open(DatabaseRelationId, ExclusiveLock);
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 5c6f2f95d5f..cd03ad1f752 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.150 2005/10/15 02:49:33 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.150.2.1 2005/11/22 18:23:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -695,8 +695,8 @@ CreateLockFile(const char *filename, bool amPostmaster,
 		/*
 		 * Try to create the lock file --- O_EXCL makes this atomic.
 		 *
-		 * Think not to make the file protection weaker than 0600.	See comments
-		 * below.
+		 * Think not to make the file protection weaker than 0600.	See
+		 * comments below.
 		 */
 		fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
 		if (fd >= 0)
@@ -757,26 +757,27 @@ CreateLockFile(const char *filename, bool amPostmaster,
 		 * carefully then all but the immediate parent shell will be
 		 * root-owned processes and so the kill test will fail with EPERM.
 		 *
-		 * We can treat the EPERM-error case as okay because that error implies
-		 * that the existing process has a different userid than we do, which
-		 * means it cannot be a competing postmaster.  A postmaster cannot
-		 * successfully attach to a data directory owned by a userid other
-		 * than its own.  (This is now checked directly in checkDataDir(), but
-		 * has been true for a long time because of the restriction that the
-		 * data directory isn't group- or world-accessible.)  Also, since we
-		 * create the lockfiles mode 600, we'd have failed above if the
-		 * lockfile belonged to another userid --- which means that whatever
-		 * process kill() is reporting about isn't the one that made the
-		 * lockfile.  (NOTE: this last consideration is the only one that
-		 * keeps us from blowing away a Unix socket file belonging to an
-		 * instance of Postgres being run by someone else, at least on
-		 * machines where /tmp hasn't got a stickybit.)
+		 * We can treat the EPERM-error case as okay because that error
+		 * implies that the existing process has a different userid than we
+		 * do, which means it cannot be a competing postmaster.  A postmaster
+		 * cannot successfully attach to a data directory owned by a userid
+		 * other than its own.	(This is now checked directly in
+		 * checkDataDir(), but has been true for a long time because of the
+		 * restriction that the data directory isn't group- or
+		 * world-accessible.)  Also, since we create the lockfiles mode 600,
+		 * we'd have failed above if the lockfile belonged to another userid
+		 * --- which means that whatever process kill() is reporting about
+		 * isn't the one that made the lockfile.  (NOTE: this last
+		 * consideration is the only one that keeps us from blowing away a
+		 * Unix socket file belonging to an instance of Postgres being run by
+		 * someone else, at least on machines where /tmp hasn't got a
+		 * stickybit.)
 		 *
-		 * Windows hasn't got getppid(), but doesn't need it since it's not using
-		 * real kill() either...
+		 * Windows hasn't got getppid(), but doesn't need it since it's not
+		 * using real kill() either...
 		 *
-		 * Normally kill() will fail with ESRCH if the given PID doesn't exist.
-		 * BeOS returns EINVAL for some silly reason, however.
+		 * Normally kill() will fail with ESRCH if the given PID doesn't
+		 * exist. BeOS returns EINVAL for some silly reason, however.
 		 */
 		if (other_pid != my_pid
 #ifndef WIN32
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 3c763e39292..1279e9a4c41 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.158 2005/10/15 02:49:33 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.158.2.1 2005/11/22 18:23:24 momjian Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -325,8 +325,8 @@ InitPostgres(const char *dbname, const char *username)
 	/*
 	 * Set up the global variables holding database id and path.
 	 *
-	 * We take a shortcut in the bootstrap case, otherwise we have to look up the
-	 * db name in pg_database.
+	 * We take a shortcut in the bootstrap case, otherwise we have to look up
+	 * the db name in pg_database.
 	 */
 	if (bootstrap)
 	{