From 5761d098ffd2fc03907b0d38d7ac6dd65c429ee8 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Wed, 28 Aug 2013 21:12:08 +0200
Subject: [PATCH] Fix zone2{sql,json} exit codes

To be consistent with general practice, fix zone2{sql,json} to exit
with:
 * 0 on success
 * 1 on error

This also moves the catch block after the last line of main, so a
"theoretically" possible exception in ::arg().mustDo would get caught.
(Also, one level less of indent!)
---
 pdns/backends/bind/zone2json.cc | 30 ++++++++++++++----------------
 pdns/backends/bind/zone2sql.cc  | 29 +++++++++++++----------------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/pdns/backends/bind/zone2json.cc b/pdns/backends/bind/zone2json.cc
index 3b8488b581..fda60801df 100644
--- a/pdns/backends/bind/zone2json.cc
+++ b/pdns/backends/bind/zone2json.cc
@@ -122,10 +122,10 @@ ArgvMap &arg()
 
 
 int main(int argc, char **argv)
+try
 {
   vector<string> lines;
 
-  try {
     reportAllTypes();
     reportFancyTypes();
 #if __GNUC__ >= 3
@@ -232,21 +232,19 @@ int main(int argc, char **argv)
       num_domainsdone=1;
     }
     cerr<<num_domainsdone<<" domains were fully parsed, containing "<<g_numRecords<<" records\n";
+
+  return 0;
     
-  }
-  catch(PDNSException &ae) {
-    cerr<<"\nFatal error: "<<ae.reason<<endl;
-    return 0;
-  }
-  catch(std::exception &e) {
-    cerr<<"died because of STL error: "<<e.what()<<endl;
-    exit(0);
-  }
-  catch(...) {
-    cerr<<"died because of unknown exception"<<endl;
-    exit(0);
-  }
-  
+}
+catch(PDNSException &ae) {
+  cerr<<"\nFatal error: "<<ae.reason<<endl;
+  return 1;
+}
+catch(std::exception &e) {
+  cerr<<"\ndied because of STL error: "<<e.what()<<endl;
+  return 1;
+}
+catch(...) {
+  cerr<<"\ndied because of unknown exception"<<endl;
   return 1;
-
 }
diff --git a/pdns/backends/bind/zone2sql.cc b/pdns/backends/bind/zone2sql.cc
index ff43f3d557..10508eb873 100644
--- a/pdns/backends/bind/zone2sql.cc
+++ b/pdns/backends/bind/zone2sql.cc
@@ -241,8 +241,8 @@ ArgvMap &arg()
 
 
 int main(int argc, char **argv)
+try
 {
-  try {
     reportAllTypes();
     reportFancyTypes();
 #if __GNUC__ >= 3
@@ -379,26 +379,23 @@ int main(int argc, char **argv)
     }
     cerr<<num_domainsdone<<" domains were fully parsed, containing "<<g_numRecords<<" records\n";
     
-  }
-  catch(PDNSException &ae) {
-    cerr<<"\nFatal error: "<<ae.reason<<endl;
-    return 0;
-  }
-  catch(std::exception &e) {
-    cerr<<"died because of STL error: "<<e.what()<<endl;
-    exit(0);
-  }
-  catch(...) {
-    cerr<<"died because of unknown exception"<<endl;
-    exit(0);
-  }
-  
   if(::arg().mustDo("transactions") && g_intransaction) {
     if(g_mode != SQLITE)
       cout<<"COMMIT WORK;"<<endl;
     else
       cout<<"COMMIT;"<<endl;
   }
+  return 0;
+}
+catch(PDNSException &ae) {
+  cerr<<"\nFatal error: "<<ae.reason<<endl;
+  return 1;
+}
+catch(std::exception &e) {
+  cerr<<"\ndied because of STL error: "<<e.what()<<endl;
+  return 1;
+}
+catch(...) {
+  cerr<<"\ndied because of unknown exception"<<endl;
   return 1;
-
 }
-- 
2.47.2