return from main instead of exit

2 files changed, 5 insertions, 5 deletions

diff --git a/vespalog/src/logger/logger.cpp b/vespalog/src/logger/logger.cpp
index 80a2f4c0aa7..0b33f251797 100644
--- a/vespalog/src/logger/logger.cpp
+++ b/vespalog/src/logger/logger.cpp
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
         default:
             fprintf(stderr, "Usage: foo | %s [-s service] [-c component]"
                     "[-l level] [-p pid]\n", argv[0]);
-            exit(ch != 'h');
+            return (ch == 'h') ? EXIT_SUCCESS : EXIT_FAILURE;
         }
     }
 
diff --git a/vespalog/src/logger/runserver.cpp b/vespalog/src/logger/runserver.cpp
index f8d16dad29e..f1754e84272 100644
--- a/vespalog/src/logger/runserver.cpp
+++ b/vespalog/src/logger/runserver.cpp
@@ -325,13 +325,13 @@ int loop(const char *svc, char * const * run)
     return WEXITSTATUS(wstat);
 }
 
-void usage(char *prog, int es)
+int usage(char *prog, int es)
 {
     fprintf(stderr, "Usage: %s\n"
             "       [-s service] [-r restartinterval] [-p pidfile]"
             " program [args ...]\n"
             "or:    [-p pidfile] [-k killcmd] -S\n", prog);
-    exit(es);
+    return es;
 }
 
 int main(int argc, char *argv[])
@@ -363,7 +363,7 @@ int main(int argc, char *argv[])
             killcmd = optarg;
             break;
         default:
-            usage(argv[0], ch != 'h');
+            return usage(argv[0], ch != 'h');
         }
     }
 
@@ -424,7 +424,7 @@ int main(int argc, char *argv[])
         return 0;
     }
     if (optind >= argc || killcmd != NULL) {
-        usage(argv[0], 1);
+        return usage(argv[0], 1);
     }
 
     if (mypf.anotherRunning()) {