Change a couple of exit(0) to return 0 to suppress complaints from

tglsfdc · tglsfdc · commit 84a0445c4d48 · 2007-07-15T22:54:21.000Z
not-too-bright compilers.  Per buildfarm results.
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
@@ -4,7 +4,7 @@
  *
  * Originally by
  * B. Palmer, bpalmer@crimelabs.net 1-17-2001
- * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.30 2006/10/19 20:38:48 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.31 2007/07/15 22:54:20 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -575,5 +575,5 @@ main(int argc, char **argv)
 	sql_exec_dumpalldbs(pgconn, my_opts);
 
 	PQfinish(pgconn);
-	exit(0);
+	return 0;
 }
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -605,18 +605,17 @@ main(int argc, char **argv)
 	 */
 	if (triggered)
 		exit(1);			/* Normal exit, with non-zero */
-	else
-	{
-		/* 
-		 * Once we have restored this file successfully we
-		 * can remove some prior WAL files.
-		 * If this restore fails we musn't remove any
-		 * file because some of them will be requested again
-		 * immediately after the failed restore, or when
-		 * we restart recovery.
-		 */
-		if (RestoreWALFileForRecovery())
-			CustomizableCleanupPriorWALFiles();
-		exit(0);
-	}
+
+	/* 
+	 * Once we have restored this file successfully we
+	 * can remove some prior WAL files.
+	 * If this restore fails we musn't remove any
+	 * file because some of them will be requested again
+	 * immediately after the failed restore, or when
+	 * we restart recovery.
+	 */
+	if (RestoreWALFileForRecovery())
+		CustomizableCleanupPriorWALFiles();
+
+	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Originally by`
`6`	`6`	`* B. Palmer, bpalmer@crimelabs.net 1-17-2001`
`7`		`- * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.30 2006/10/19 20:38:48 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.31 2007/07/15 22:54:20 tgl Exp $`
`8`	`8`	`*/`
`9`	`9`	`#include "postgres_fe.h"`
`10`	`10`
`@@ -575,5 +575,5 @@ main(int argc, char **argv)`
`575`	`575`	`sql_exec_dumpalldbs(pgconn, my_opts);`
`576`	`576`
`577`	`577`	`PQfinish(pgconn);`
`578`		`- exit(0);`
	`578`	`+ return 0;`
`579`	`579`	`}`