avoid naked exit

9 files changed, 25 insertions, 26 deletions

diff --git a/fsa/queryproc/count_plain_grams.cpp b/fsa/queryproc/count_plain_grams.cpp
index ef400db9bc4..ffb5c730cdc 100644
--- a/fsa/queryproc/count_plain_grams.cpp
+++ b/fsa/queryproc/count_plain_grams.cpp
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
 
   if(argc!=2){
     std::cerr << "usage: " << argv[0] << " fsa_file" << std::endl;
-    exit(1);
+    return 1;
   }
 
   FSA fsa(argv[1]);
diff --git a/fsa/queryproc/count_sorted_grams.cpp b/fsa/queryproc/count_sorted_grams.cpp
index cd047633e72..84350068f69 100644
--- a/fsa/queryproc/count_sorted_grams.cpp
+++ b/fsa/queryproc/count_sorted_grams.cpp
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
 
   if(argc!=2){
     std::cerr << "usage: " << argv[0] << " sorted_fsa_file" << std::endl;
-    exit(1);
+    return 1;
   }
 
   FSA fsa(argv[1]);
diff --git a/fsa/queryproc/p2s_ratio.cpp b/fsa/queryproc/p2s_ratio.cpp
index 830985813a8..9238df6eddc 100644
--- a/fsa/queryproc/p2s_ratio.cpp
+++ b/fsa/queryproc/p2s_ratio.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
 
   if(argc!=3){
     std::cerr << "usage: " << argv[0] << " plain_count_fsa_file sorted_count_fsa_file" << std::endl;
-    exit(1);
+    return 1;
   }
 
   FSA plain_fsa(argv[1]);
diff --git a/fsa/src/alltest/conceptnet_test.cpp b/fsa/src/alltest/conceptnet_test.cpp
index 157903fcd4e..03a88434776 100644
--- a/fsa/src/alltest/conceptnet_test.cpp
+++ b/fsa/src/alltest/conceptnet_test.cpp
@@ -29,13 +29,13 @@ int main(int argc, char **argv)
       break;
     case '?':
       fprintf(stderr,"conceptnet_test: unrecognized option");
-      exit(1);
+      return 1;
     }
   }
 
   if(optind>=argc){
     fprintf(stderr,"usage: conceptnet_test [-aec] DOMAIN [UNIT ...]\n");
-    exit(1);
+    return 1;
   }
 
   std::string domain = argv[optind];
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
                                          domain + ".fsa",
                                          domain + ".dat")){
     fprintf(stderr,"failed to load concept net %s\n",domain.c_str());
-    exit(1);
+    return 1;
   }
 
   ConceptNet::Handle* cn = ConceptNetManager::instance().get(domain);
@@ -71,10 +71,9 @@ int main(int argc, char **argv)
         }
       }
     }
-  }
-  else {
+  } else {
     fprintf(stderr,"failed to load concept net %s\n",domain.c_str());
-    exit(1);
+    return 1;
   }
-
+  return 0;
 }
diff --git a/fsa/src/alltest/fsamanager_test.cpp b/fsa/src/alltest/fsamanager_test.cpp
index aee97432347..a4d8b234415 100644
--- a/fsa/src/alltest/fsamanager_test.cpp
+++ b/fsa/src/alltest/fsamanager_test.cpp
@@ -12,7 +12,7 @@ int main(int argc, char** argv)
 {
   if(argc<3){
     std::cerr << "usage: fsamanager_test cache_dir fsa_file_or_url [fsa_file_or_url ...]\n";
-    exit(1);
+    return 1;
   }
 
   FSAManager::instance().setCacheDir(argv[1]);
diff --git a/fsa/src/alltest/lookup_test.cpp b/fsa/src/alltest/lookup_test.cpp
index dcb570f09a2..dcc20075a98 100644
--- a/fsa/src/alltest/lookup_test.cpp
+++ b/fsa/src/alltest/lookup_test.cpp
@@ -20,7 +20,7 @@ int main(int argc, char** argv)
 
   if(argc!=2){
     std::cerr << "usage: lookup_test fsafile <input >output" << std::endl;
-    exit(1);
+    return 1;
   }
 
   FSA f(argv[1]);
diff --git a/fsa/src/apps/fsadump/fsadump.cpp b/fsa/src/apps/fsadump/fsadump.cpp
index 16e128f33ca..5308f113356 100644
--- a/fsa/src/apps/fsadump/fsadump.cpp
+++ b/fsa/src/apps/fsadump/fsadump.cpp
@@ -80,10 +80,10 @@ int main(int argc, char** argv)
       break;
     case 'h':
       usage(argv[0]);
-      exit(0);
+      return 0;
     case 'V':
       version();
-      exit(0);
+      return 0;
     case 't':
       format = OUTPUT_TEXT;
       break;
@@ -101,13 +101,13 @@ int main(int argc, char** argv)
       break;
     case '?':
       usage(argv[0],"unrecognized option");
-      exit(1);
+      return 1;
     }
   }
 
   if(optind!=argc-1){
     usage(argv[0],"required parameter(s) missing");
-    exit(1);
+    return 1;
   }
 
   if(format==OUTPUT_UNDEF) // use default format (warning?)
@@ -119,7 +119,7 @@ int main(int argc, char** argv)
 
   if(!fsa.isOk()){
     std::cerr << "Failed to open fsa file (" << input_file << ")" << std::endl;
-    exit(1);
+    return 1;
   }
 
   std::string meta,temp;
diff --git a/fsa/src/apps/fsainfo/fsainfo.cpp b/fsa/src/apps/fsainfo/fsainfo.cpp
index 31b23c17401..61af267545b 100644
--- a/fsa/src/apps/fsainfo/fsainfo.cpp
+++ b/fsa/src/apps/fsainfo/fsainfo.cpp
@@ -48,19 +48,19 @@ int main(int argc, char** argv)
     switch(opt){
     case 'h':
       usage(argv[0]);
-      exit(0);
+      return 0;
     case 'V':
       version();
-      exit(0);
+      return 0;
     case '?':
       usage(argv[0],"unrecognized option");
-      exit(1);
+      return 1;
     }
   }
 
   if(optind!=argc-1){
     usage(argv[0],"required parameter fsa is missing");
-    exit(1);
+    return 1;
   }
 
   fsa_file = argv[optind];
diff --git a/fsa/src/apps/makefsa/makefsa.cpp b/fsa/src/apps/makefsa/makefsa.cpp
index 59b7e2c27d0..f86a0d781c1 100644
--- a/fsa/src/apps/makefsa/makefsa.cpp
+++ b/fsa/src/apps/makefsa/makefsa.cpp
@@ -87,10 +87,10 @@ int main(int argc, char** argv)
       break;
     case 'h':
       usage(argv[0]);
-      exit(0);
+      return 0;
     case 'V':
       version();
-      exit(0);
+      return 0;
     case 't':
       format = INPUT_TEXT;
       break;
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
       num_size = strtoul(optarg,NULL,0);
       if(num_size!=1 && num_size!=2 && num_size!=4){
         usage(argv[0],"invalid numerical info size (-s)");
-        exit(1);
+        return 1;
       }
       break;
     case 'z':
@@ -124,7 +124,7 @@ int main(int argc, char** argv)
       break;
     case '?':
       usage(argv[0],"unrecognized option");
-      exit(1);
+      return 1;
     }
   }
 
@@ -141,7 +141,7 @@ int main(int argc, char** argv)
   }
   else{
     usage(argv[0],"required parameter(s) missing");
-    exit(1);
+    return 1;
   }
 
   Automaton automaton;