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

not-too-bright compilers.  Per buildfarm results.

diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 79df423b55d9acf94bf7b60381fd414b772df4d1..691b2f28d19471930576f57dd54a3812333d829e 100644 (file)
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -4,7 +4,7 @@
  *
  * Originally by
  * B. Palmer, [email protected] 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
index bb885384c3e0ae370066e983a3aca0635fac8103..7eb4a51ba4cc19ceab646a2d60f2e13a8796b990 100644 (file)
--- 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;
 }