4 files changed, 9 insertions, 9 deletions
diff --git a/searchsummary/src/tests/extractkeywords/extractkeywordstest.cpp b/searchsummary/src/tests/extractkeywords/extractkeywordstest.cpp
index 9b2510ac3df..4abbe7d2613 100644
--- a/searchsummary/src/tests/extractkeywords/extractkeywordstest.cpp
+++ b/searchsummary/src/tests/extractkeywords/extractkeywordstest.cpp
@@ -18,7 +18,7 @@ ExtractKeywordsTest::Main()
     bool failed = false;
 
     if (_argc == 1)
-        Usage(_argv[0]);
+        return Usage(_argv[0]);
 
     // default initialize to not run any tests.
     for (int n = 0; n < NUMTESTS; n++)
@@ -271,7 +271,7 @@ ExtractKeywordsTest::RunTest(int testno, bool verify)
     return result;
 }
 
-void
+int
 ExtractKeywordsTest::Usage(char *progname)
 {
     printf("%s {testnospec}+\n\
@@ -279,7 +279,7 @@ ExtractKeywordsTest::Usage(char *progname)
       num:     single test\n\
       num-num: inclusive range (open range permitted)\n",progname);
     printf("There are tests from %d to %d\n\n", 0, NUMTESTS-1);
-    exit(-1);
+    return EXIT_FAILURE;
 }
 
 int
diff --git a/searchsummary/src/tests/extractkeywords/extractkeywordstest.h b/searchsummary/src/tests/extractkeywords/extractkeywordstest.h
index e3c79bfc202..739ba4bf1ff 100644
--- a/searchsummary/src/tests/extractkeywords/extractkeywordstest.h
+++ b/searchsummary/src/tests/extractkeywords/extractkeywordstest.h
@@ -15,7 +15,7 @@ private:
     search::docsummary::KeywordExtractor *_extractor;
 
     int Main() override;
-    void Usage(char *progname);
+    int Usage(char *progname);
     bool ShowResult(int testNo, const char *actual, const char *correct);
     bool RunTest(int i, bool verify);
 
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()) {