avoid naked exit

3 files changed, 8 insertions, 9 deletions

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]);