pgindent run for 9.0, second run

Author: bmomjian

contrib/dblink/dblink.c

@@ -8,7 +8,7 @@
  * Darko Prenosil <Darko.Prenosil@finteh.hr>
  * Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
  *
- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.98 2010/06/15 20:29:01 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.99 2010/07/06 19:18:54 momjian Exp $
  * Copyright (c) 2001-2010, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -1797,7 +1797,7 @@ get_sql_delete(Relation rel, int *pkattnums, int pknumatts, char **tgt_pkattvals
 			appendStringInfo(&buf, " AND ");
 
 		appendStringInfoString(&buf,
-		   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
+			   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
 
 		if (tgt_pkattvals[i] != NULL)
 			appendStringInfo(&buf, " = %s",
@@ -1880,7 +1880,7 @@ get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
 			appendStringInfo(&buf, " AND ");
 
 		appendStringInfo(&buf, "%s",
-		   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
+			   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
 
 		val = tgt_pkattvals[i];
 
@@ -1976,8 +1976,8 @@ get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pk
 	 * Build sql statement to look up tuple of interest, ie, the one matching
 	 * src_pkattvals.  We used to use "SELECT *" here, but it's simpler to
 	 * generate a result tuple that matches the table's physical structure,
-	 * with NULLs for any dropped columns.  Otherwise we have to deal with
-	 * two different tupdescs and everything's very confusing.
+	 * with NULLs for any dropped columns.	Otherwise we have to deal with two
+	 * different tupdescs and everything's very confusing.
 	 */
 	appendStringInfoString(&buf, "SELECT ");
 
@@ -1990,7 +1990,7 @@ get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pk
 			appendStringInfoString(&buf, "NULL");
 		else
 			appendStringInfoString(&buf,
-								   quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
+					  quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
 	}
 
 	appendStringInfo(&buf, " FROM %s WHERE ", relname);
@@ -2003,7 +2003,7 @@ get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pk
 			appendStringInfo(&buf, " AND ");
 
 		appendStringInfoString(&buf,
-		   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
+			   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
 
 		if (src_pkattvals[i] != NULL)
 			appendStringInfo(&buf, " = %s",
@@ -2417,9 +2417,9 @@ validate_pkattnums(Relation rel,
 	/* Validate attnums and convert to internal form */
 	for (i = 0; i < pknumatts_arg; i++)
 	{
-		int		pkattnum = pkattnums_arg->values[i];
-		int		lnum;
-		int		j;
+		int			pkattnum = pkattnums_arg->values[i];
+		int			lnum;
+		int			j;
 
 		/* Can throw error immediately if out of range */
 		if (pkattnum <= 0 || pkattnum > natts)

contrib/fuzzystrmatch/dmetaphone.c

@@ -1,7 +1,7 @@
 /*
  * This is a port of the Double Metaphone algorithm for use in PostgreSQL.
  *
- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.14 2010/04/05 02:46:20 adunstan Exp $
+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.15 2010/07/06 19:18:55 momjian Exp $
  *
  * Double Metaphone computes 2 "sounds like" strings - a primary and an
  * alternate. In most cases they are the same, but for foreign names
@@ -461,7 +461,7 @@ DoubleMetaphone(char *str, char **codes)
 					current += 1;
 				break;
 
-			case '\xc7': /* C with cedilla */
+			case '\xc7':		/* C with cedilla */
 				MetaphAdd(primary, "S");
 				MetaphAdd(secondary, "S");
 				current += 1;
@@ -1037,7 +1037,7 @@ DoubleMetaphone(char *str, char **codes)
 				MetaphAdd(secondary, "N");
 				break;
 
-			case '\xd1': /* N with tilde */
+			case '\xd1':		/* N with tilde */
 				current += 1;
 				MetaphAdd(primary, "N");
 				MetaphAdd(secondary, "N");

contrib/pg_archivecleanup/pg_archivecleanup.c

@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pg_archivecleanup/pg_archivecleanup.c,v 1.2 2010/06/17 17:31:27 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pg_archivecleanup/pg_archivecleanup.c,v 1.3 2010/07/06 19:18:55 momjian Exp $
  *
  * pg_archivecleanup.c
  *
@@ -40,8 +40,9 @@ bool		debug = false;		/* are we debugging? */
 char	   *archiveLocation;	/* where to find the archive? */
 char	   *restartWALFileName; /* the file from which we can restart restore */
 char		WALFilePath[MAXPGPATH];		/* the file path including archive */
-char		exclusiveCleanupFileName[MAXPGPATH];		/* the oldest file we want to
-														 * remain in archive */
+char		exclusiveCleanupFileName[MAXPGPATH];		/* the oldest file we
+														 * want to remain in
+														 * archive */
 
 
 /* =====================================================================
@@ -68,14 +69,14 @@ char		exclusiveCleanupFileName[MAXPGPATH];		/* the oldest file we want to
 /*
  *	Initialize allows customized commands into the archive cleanup program.
  *
- *  You may wish to add code to check for tape libraries, etc..
+ *	You may wish to add code to check for tape libraries, etc..
  */
 static void
 Initialize(void)
 {
 	/*
-	 * This code assumes that archiveLocation is a directory, so we use
-	 * stat to test if it's accessible.
+	 * This code assumes that archiveLocation is a directory, so we use stat
+	 * to test if it's accessible.
 	 */
 	struct stat stat_buf;
 
@@ -100,22 +101,21 @@ CleanupPriorWALFiles(void)
 		while ((xlde = readdir(xldir)) != NULL)
 		{
 			/*
-			 * We ignore the timeline part of the XLOG segment identifiers
-			 * in deciding whether a segment is still needed.  This
-			 * ensures that we won't prematurely remove a segment from a
-			 * parent timeline. We could probably be a little more
-			 * proactive about removing segments of non-parent timelines,
-			 * but that would be a whole lot more complicated.
+			 * We ignore the timeline part of the XLOG segment identifiers in
+			 * deciding whether a segment is still needed.	This ensures that
+			 * we won't prematurely remove a segment from a parent timeline.
+			 * We could probably be a little more proactive about removing
+			 * segments of non-parent timelines, but that would be a whole lot
+			 * more complicated.
 			 *
-			 * We use the alphanumeric sorting property of the filenames
-			 * to decide which ones are earlier than the
-			 * exclusiveCleanupFileName file. Note that this means files
-			 * are not removed in the order they were originally written,
-			 * in case this worries you.
+			 * We use the alphanumeric sorting property of the filenames to
+			 * decide which ones are earlier than the exclusiveCleanupFileName
+			 * file. Note that this means files are not removed in the order
+			 * they were originally written, in case this worries you.
 			 */
 			if (strlen(xlde->d_name) == XLOG_DATA_FNAME_LEN &&
-				strspn(xlde->d_name, "0123456789ABCDEF") == XLOG_DATA_FNAME_LEN &&
-			  strcmp(xlde->d_name + 8, exclusiveCleanupFileName + 8) < 0)
+			strspn(xlde->d_name, "0123456789ABCDEF") == XLOG_DATA_FNAME_LEN &&
+				strcmp(xlde->d_name + 8, exclusiveCleanupFileName + 8) < 0)
 			{
 #ifdef WIN32
 				snprintf(WALFilePath, MAXPGPATH, "%s\\%s", archiveLocation, xlde->d_name);
@@ -152,13 +152,13 @@ CleanupPriorWALFiles(void)
 static void
 SetWALFileNameForCleanup(void)
 {
-	bool	fnameOK = false;
+	bool		fnameOK = false;
 
 	/*
-	 * If restartWALFileName is a WAL file name then just use it directly.
-	 * If restartWALFileName is a .backup filename, make sure we use
-	 * the prefix of the filename, otherwise we will remove wrong files
-	 * since 000000010000000000000010.00000020.backup is after 
+	 * If restartWALFileName is a WAL file name then just use it directly. If
+	 * restartWALFileName is a .backup filename, make sure we use the prefix
+	 * of the filename, otherwise we will remove wrong files since
+	 * 000000010000000000000010.00000020.backup is after
 	 * 000000010000000000000010.
 	 */
 	if (strlen(restartWALFileName) == XLOG_DATA_FNAME_LEN &&
@@ -169,17 +169,20 @@ SetWALFileNameForCleanup(void)
 	}
 	else if (strlen(restartWALFileName) == XLOG_BACKUP_FNAME_LEN)
 	{
-		int	args;
+		int			args;
 		uint32		tli = 1,
 					log = 0,
 					seg = 0,
 					offset = 0;
+
 		args = sscanf(restartWALFileName, "%08X%08X%08X.%08X.backup", &tli, &log, &seg, &offset);
 		if (args == 4)
 		{
 			fnameOK = true;
+
 			/*
-			 * Use just the prefix of the filename, ignore everything after first period
+			 * Use just the prefix of the filename, ignore everything after
+			 * first period
 			 */
 			XLogFileName(exclusiveCleanupFileName, tli, log, seg);
 		}
@@ -205,12 +208,12 @@ usage(void)
 	printf("Usage:\n");
 	printf("  %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n", progname);
 	printf("\n"
-		"for use as an archive_cleanup_command in the recovery.conf when standby_mode = on:\n"
+		   "for use as an archive_cleanup_command in the recovery.conf when standby_mode = on:\n"
 		   "  archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
 		   "e.g.\n"
 		   "  archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n");
 	printf("\n"
-		"or for use as a standalone archive cleaner:\n"
+		   "or for use as a standalone archive cleaner:\n"
 		   "e.g.\n"
 		   "  pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n");
 	printf("\nOptions:\n");
@@ -258,9 +261,10 @@ main(int argc, char **argv)
 
 	/*
 	 * We will go to the archiveLocation to check restartWALFileName.
-	 * restartWALFileName may not exist anymore, which would not be an error, so
-	 * we separate the archiveLocation and restartWALFileName so we can check
-	 * separately whether archiveLocation exists, if not that is an error
+	 * restartWALFileName may not exist anymore, which would not be an error,
+	 * so we separate the archiveLocation and restartWALFileName so we can
+	 * check separately whether archiveLocation exists, if not that is an
+	 * error
 	 */
 	if (optind < argc)
 	{

contrib/pg_upgrade/check.c

@@ -4,7 +4,7 @@
  *	server checks and output routines
  *
  *	Copyright (c) 2010, PostgreSQL Global Development Group
- *	$PostgreSQL: pgsql/contrib/pg_upgrade/check.c,v 1.10 2010/07/03 16:33:14 momjian Exp $
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/check.c,v 1.11 2010/07/06 19:18:55 momjian Exp $
  */
 
 #include "pg_upgrade.h"
@@ -152,8 +152,8 @@ issue_warnings(migratorContext *ctx, char *sequence_script_file_name)
 		{
 			prep_status(ctx, "Adjusting sequences");
 			exec_prog(ctx, true,
-					  SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d "
-					  "--username \"%s\" -f \"%s\" --dbname template1 >> \"%s\""
+				  SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d "
+				   "--username \"%s\" -f \"%s\" --dbname template1 >> \"%s\""
 					  SYSTEMQUOTE,
 					  ctx->new.bindir, ctx->new.port, ctx->user,
 					  sequence_script_file_name, ctx->logfile);
@@ -217,7 +217,7 @@ check_cluster_versions(migratorContext *ctx)
 	/* Only current PG version is supported as a target */
 	if (GET_MAJOR_VERSION(ctx->new.major_version) != GET_MAJOR_VERSION(PG_VERSION_NUM))
 		pg_log(ctx, PG_FATAL, "This utility can only upgrade to PostgreSQL version %s.\n",
-				PG_MAJORVERSION);
+			   PG_MAJORVERSION);
 
 	/*
 	 * We can't allow downgrading because we use the target pg_dumpall, and
@@ -375,7 +375,7 @@ check_new_db_is_empty(migratorContext *ctx)
  */
 void
 create_script_for_old_cluster_deletion(migratorContext *ctx,
-										char **deletion_script_file_name)
+									   char **deletion_script_file_name)
 {
 	FILE	   *script = NULL;
 	int			tblnum;
@@ -389,7 +389,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
 
 	if ((script = fopen(*deletion_script_file_name, "w")) == NULL)
 		pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n",
-					*deletion_script_file_name);
+			   *deletion_script_file_name);
 
 #ifndef WIN32
 	/* add shebang header */
@@ -420,6 +420,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
 			}
 		}
 		else
+
 			/*
 			 * Simply delete the tablespace directory, which might be ".old"
 			 * or a version-specific subdirectory.
@@ -433,7 +434,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
 #ifndef WIN32
 	if (chmod(*deletion_script_file_name, S_IRWXU) != 0)
 		pg_log(ctx, PG_FATAL, "Could not add execute permission to file:  %s\n",
-				*deletion_script_file_name);
+			   *deletion_script_file_name);
 #endif
 
 	check_ok(ctx);

contrib/pg_upgrade/controldata.c

@@ -4,7 +4,7 @@
  *	controldata functions
  *
  *	Copyright (c) 2010, PostgreSQL Global Development Group
- *	$PostgreSQL: pgsql/contrib/pg_upgrade/controldata.c,v 1.8 2010/07/03 16:33:14 momjian Exp $
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/controldata.c,v 1.9 2010/07/06 19:18:55 momjian Exp $
  */
 
 #include "pg_upgrade.h"
@@ -93,6 +93,7 @@ get_control_data(migratorContext *ctx, ClusterInfo *cluster, bool live_check)
 			fputs(bufin, ctx->debug_fd);
 
 #ifdef WIN32
+
 		/*
 		 * Due to an installer bug, LANG=C doesn't work for PG 8.3.3, but does
 		 * work 8.2.6 and 8.3.7, so check for non-ASCII output and suggest a

contrib/pg_upgrade/dump.c

@@ -4,7 +4,7 @@
  *	dump functions
  *
  *	Copyright (c) 2010, PostgreSQL Global Development Group
- *	$PostgreSQL: pgsql/contrib/pg_upgrade/dump.c,v 1.6 2010/07/03 16:33:14 momjian Exp $
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/dump.c,v 1.7 2010/07/06 19:18:55 momjian Exp $
  */
 
 #include "pg_upgrade.h"
@@ -24,7 +24,7 @@ generate_old_dump(migratorContext *ctx)
 	exec_prog(ctx, true,
 			  SYSTEMQUOTE "\"%s/pg_dumpall\" --port %d --username \"%s\" "
 			  "--schema-only --binary-upgrade > \"%s/" ALL_DUMP_FILE "\""
-			  SYSTEMQUOTE, ctx->new.bindir, ctx->old.port, ctx->user, ctx->cwd);
+		   SYSTEMQUOTE, ctx->new.bindir, ctx->old.port, ctx->user, ctx->cwd);
 	check_ok(ctx);
 }
 

contrib/pg_upgrade/exec.c

@@ -4,7 +4,7 @@
  *	execution functions
  *
  *	Copyright (c) 2010, PostgreSQL Global Development Group
- *	$PostgreSQL: pgsql/contrib/pg_upgrade/exec.c,v 1.7 2010/07/03 16:33:14 momjian Exp $
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/exec.c,v 1.8 2010/07/06 19:18:55 momjian Exp $
  */
 
 #include "pg_upgrade.h"
@@ -14,7 +14,7 @@
 
 
 static void checkBinDir(migratorContext *ctx, ClusterInfo *cluster);
-static int check_exec(migratorContext *ctx, const char *dir, const char *cmdName);
+static int	check_exec(migratorContext *ctx, const char *dir, const char *cmdName);
 static const char *validate_exec(const char *path);
 static int	check_data_dir(migratorContext *ctx, const char *pg_data);
 
@@ -311,5 +311,3 @@ check_data_dir(migratorContext *ctx, const char *pg_data)
 
 	return (fail) ? -1 : 0;
 }
-
-

contrib/pg_upgrade/file.c

@@ -4,7 +4,7 @@
  *	file system operations
  *
  *	Copyright (c) 2010, PostgreSQL Global Development Group
- *	$PostgreSQL: pgsql/contrib/pg_upgrade/file.c,v 1.12 2010/07/03 16:33:14 momjian Exp $
+ *	$PostgreSQL: pgsql/contrib/pg_upgrade/file.c,v 1.13 2010/07/06 19:18:55 momjian Exp $
  */
 
 #include "pg_upgrade.h"
@@ -226,7 +226,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
  */
 int
 pg_scandir(migratorContext *ctx, const char *dirname,
-		   struct dirent ***namelist,
+		   struct dirent *** namelist,
 		   int (*selector) (const struct dirent *))
 {
 #ifndef HAVE_SCANDIR
@@ -235,13 +235,14 @@ pg_scandir(migratorContext *ctx, const char *dirname,
 	/*
 	 * scandir() is originally from BSD 4.3, which had the third argument as
 	 * non-const. Linux and other C libraries have updated it to use a const.
-	 * http://unix.derkeiler.com/Mailing-Lists/FreeBSD/questions/2005-12/msg00214.html
+	 * http://unix.derkeiler.com/Mailing-Lists/FreeBSD/questions/2005-12/msg002
+	 * 14.html
 	 *
 	 * Here we try to guess which libc's need const, and which don't. The net
 	 * goal here is to try to suppress a compiler warning due to a prototype
 	 * mismatch of const usage. Ideally we would do this via autoconf, but
-	 * autoconf doesn't have a suitable builtin test and it seems overkill
-	 * to add one just to avoid a warning.
+	 * autoconf doesn't have a suitable builtin test and it seems overkill to
+	 * add one just to avoid a warning.
 	 */
 #elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__darwin__) || defined(__OpenBSD__)
 	/* no const */