daemons: tools: replace 0 exits with BEXIT_SUCCESS

core/src/console/console.cc

@@ -27,6 +27,7 @@
  */
 
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "console/console_conf.h"
 #include "console/console_globals.h"
 #include "console/auth_pam.h"
@@ -939,16 +940,16 @@ int main(int argc, char* argv[])
     my_config = InitConsConfig(configfile, M_CONFIG_ERROR);
     PrintConfigSchemaJson(buffer);
     printf("%s\n", buffer.c_str());
-    exit(0);
+    exit(BEXIT_SUCCESS);
   }
 
   my_config = InitConsConfig(configfile, M_CONFIG_ERROR);
   my_config->ParseConfigOrExit();
 
   if (export_config) {
     my_config->DumpResources(PrintMessage, NULL);
-    TerminateConsole(0);
-    exit(0);
+    TerminateConsole(BEXIT_SUCCESS);
+    exit(BEXIT_SUCCESS);
   }
 
   if (InitCrypto() != 0) {
@@ -969,8 +970,8 @@ int main(int argc, char* argv[])
   }
 
   if (test_config) {
-    TerminateConsole(0);
-    exit(0);
+    TerminateConsole(BEXIT_SUCCESS);
+    exit(BEXIT_SUCCESS);
   }
 
   (void)WSA_Init(); /* Initialize Windows sockets */
@@ -1097,8 +1098,8 @@ int main(int argc, char* argv[])
 
   if (history_file.size()) { ConsoleUpdateHistory(history_file.c_str()); }
 
-  TerminateConsole(0);
-  return 0;
+  TerminateConsole(BEXIT_SUCCESS);
+  return BEXIT_SUCCESS;
 }
 
 static void TerminateConsole(int sig)

core/src/dird/dbcheck.cc

@@ -24,6 +24,7 @@
 // Program to check a BAREOS database for consistency and to make repairs
 
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "cats/cats.h"
 #include "lib/runscript.h"
 #include "lib/cli.h"
@@ -906,7 +907,7 @@ int main(int argc, char* argv[])
       // Print catalog information and exit (-B)
       if (print_catalog) {
         PrintCatalogDetails(catalog);
-        exit(0);
+        exit(BEXIT_SUCCESS);
       }
 
       db_name = catalog->db_name;
@@ -946,5 +947,5 @@ int main(int argc, char* argv[])
   CloseMsg(nullptr);
   TermMsg();
 
-  return 0;
+  return BEXIT_SUCCESS;
 }

core/src/dird/dird.cc

@@ -27,6 +27,7 @@
  */
 
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "cats/sql.h"
 #include "cats/sql_pooling.h"
 #include "dird.h"
@@ -258,8 +259,8 @@ int main(int argc, char* argv[])
     PrintConfigSchemaJson(buffer);
     printf("%s\n", buffer.c_str());
 
-    TerminateDird(0);
-    return 0;
+    TerminateDird(BEXIT_SUCCESS);
+    return BEXIT_SUCCESS;
   }
 
   my_config->ParseConfigOrExit();
@@ -272,16 +273,16 @@ int main(int argc, char* argv[])
       rc = 1;
     }
     TerminateDird(rc);
-    return 0;
+    return BEXIT_SUCCESS;
   }
 
   if (!CheckResources()) {
     Jmsg((JobControlRecord*)NULL, M_ERROR_TERM, 0,
          _("Please correct the configuration in %s\n"),
          my_config->get_base_config_path().c_str());
 
-    TerminateDird(0);
-    return 0;
+    TerminateDird(BEXIT_SUCCESS);
+    return BEXIT_SUCCESS;
   }
 
   if (my_config->HasWarnings()) {
@@ -301,8 +302,8 @@ int main(int argc, char* argv[])
     Jmsg((JobControlRecord*)nullptr, M_ERROR_TERM, 0,
          _("Cryptography library initialization failed.\n"));
 
-    TerminateDird(0);
-    return 0;
+    TerminateDird(BEXIT_SUCCESS);
+    return BEXIT_SUCCESS;
   }
 
   if (!test_config) {
@@ -323,8 +324,8 @@ int main(int argc, char* argv[])
          _("Please correct the configuration in %s\n"),
          my_config->get_base_config_path().c_str());
 
-    TerminateDird(0);
-    return 0;
+    TerminateDird(BEXIT_SUCCESS);
+    return BEXIT_SUCCESS;
   }
 
   if (test_config) { TerminateDird(0); }
@@ -334,8 +335,8 @@ int main(int argc, char* argv[])
          _("Please correct the configuration in %s\n"),
          my_config->get_base_config_path().c_str());
 
-    TerminateDird(0);
-    return 0;
+    TerminateDird(BEXIT_SUCCESS);
+    return BEXIT_SUCCESS;
   }
 
   MyNameIs(0, nullptr, me->resource_name_); /* set user defined name */
@@ -370,8 +371,8 @@ int main(int argc, char* argv[])
 
   Scheduler::GetMainScheduler().Run();
 
-  TerminateDird(0);
-  return 0;
+  TerminateDird(BEXIT_SUCCESS);
+  return BEXIT_SUCCESS;
 }
 
 /**

core/src/filed/filed.cc

@@ -188,7 +188,7 @@ int main(int argc, char* argv[])
     PrintConfigSchemaJson(buffer);
     printf("%s\n", buffer.c_str());
 
-    exit(0);
+    exit(BEXIT_SUCCESS);
   }
 
   my_config = InitFdConfig(configfile, M_CONFIG_ERROR);
@@ -197,7 +197,7 @@ int main(int argc, char* argv[])
   if (export_config) {
     my_config->DumpResources(PrintMessage, nullptr);
 
-    exit(0);
+    exit(BEXIT_SUCCESS);
   }
 
   if (!CheckResources()) {
@@ -248,9 +248,8 @@ int main(int argc, char* argv[])
   // start socket server to listen for new connections.
   StartSocketServer(me->FDaddrs);
 
-  TerminateFiled(0);
-
-  exit(0);
+  TerminateFiled(BEXIT_SUCCESS);
+  return BEXIT_SUCCESS;
 }
 
 namespace filedaemon {

core/src/lib/daemon.cc

@@ -36,6 +36,7 @@
 
 #include "include/fcntl_def.h"
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "lib/berrno.h"
 #include "lib/daemon.h"
 
@@ -85,7 +86,7 @@ void daemon_start(const char* progname,
       break;
     }
     default:
-      exit(0);
+      exit(BEXIT_SUCCESS);
   }
 
   Dmsg0(900, "Exit daemon_start\n");

core/src/qt-tray-monitor/tray-monitor.cc

@@ -39,6 +39,7 @@
 #include "lib/parse_conf.h"
 #include "lib/cli.h"
 #include "lib/crypto.h"
+#include "include/exit_codes.h"
 
 ConfigurationParser* my_config = nullptr;
 
@@ -169,7 +170,7 @@ int main(int argc, char* argv[])
     PrintConfigSchemaJson(buffer);
     printf("%s\n", buffer.c_str());
     fflush(stdout);
-    exit(0);
+    exit(BEXIT_SUCCESS);
   }
 
   // read the config file

core/src/stored/bcopy.cc

@@ -27,6 +27,7 @@
  */
 
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "stored/stored.h"
 #include "stored/stored_globals.h"
 #include "stored/device_control_record.h"
@@ -266,7 +267,7 @@ int main(int argc, char* argv[])
   delete out_dev;
 
 
-  return 0;
+  return BEXIT_SUCCESS;
 }
 
 

core/src/stored/bextract.cc

@@ -28,6 +28,7 @@
 
 #include <unistd.h>
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "include/filetypes.h"
 #include "include/streams.h"
 #include "stored/stored.h"
@@ -261,7 +262,7 @@ int main(int argc, char* argv[])
   }
   TermIncludeExcludeFiles(ff);
   TermFindFiles(ff);
-  return 0;
+  return BEXIT_SUCCESS;
 }
 
 // Cleanup of delayed restore stack with streams for later processing.

core/src/stored/bls.cc

@@ -28,6 +28,7 @@
 
 #include <unistd.h>
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "include/streams.h"
 #include "stored/stored.h"
 #include "stored/stored_globals.h"
@@ -276,7 +277,7 @@ int main(int argc, char* argv[])
   if (bsr) { libbareos::FreeBsr(bsr); }
   TermIncludeExcludeFiles(ff);
   TermFindFiles(ff);
-  return 0;
+  return BEXIT_SUCCESS;
 }
 
 static void do_close(JobControlRecord* jcr)

core/src/stored/bscan.cc

@@ -29,6 +29,7 @@
  */
 
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "include/filetypes.h"
 #include "include/streams.h"
 #include "stored/stored.h"
@@ -343,7 +344,7 @@ int main(int argc, char* argv[])
   FreeJcr(bjcr);
   UnloadSdPlugins();
 
-  return 0;
+  return BEXIT_SUCCESS;
 }
 
 /**

core/src/stored/stored.cc

@@ -32,6 +32,7 @@
  */
 
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "stored/stored.h"
 #include "lib/crypto_cache.h"
 #include "stored/acquire.h"
@@ -220,7 +221,7 @@ int main(int argc, char* argv[])
     PrintConfigSchemaJson(buffer);
     printf("%s\n", buffer.c_str());
 
-    return 0;
+    return BEXIT_SUCCESS;
   }
 
   my_config = InitSdConfig(configfile, M_CONFIG_ERROR);
@@ -235,7 +236,7 @@ int main(int argc, char* argv[])
   if (export_config) {
     my_config->DumpResources(PrintMessage, nullptr);
 
-    return 0;
+    return BEXIT_SUCCESS;
   }
 
   if (!CheckResources()) {
@@ -312,9 +313,9 @@ int main(int argc, char* argv[])
   StartSocketServer(me->SDaddrs);
 
   /* to keep compiler quiet */
-  TerminateStored(0);
+  TerminateStored(BEXIT_SUCCESS);
 
-  return 0;
+  return BEXIT_SUCCESS;
 }
 
 /* Check Configuration file for necessary info */

core/src/tools/bregex.cc

@@ -104,5 +104,5 @@ int main(int argc, char** argv)
     fclose(fd);
     regfree(&preg);
   }
-  exit(0);
+  return BEXIT_SUCCESS;
 }

core/src/tools/bsmtp.cc

@@ -61,6 +61,7 @@
 #include <pwd.h>
 #include <unistd.h>
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "include/jcr.h"
 #include "lib/cli.h"
 #include "lib/bstringlist.h"
@@ -619,5 +620,5 @@ int main(int argc, char* argv[])
   chat(my_hostname, mailhost, "QUIT\r\n");
 
   //  Go away gracefully ...
-  exit(0);
+  return BEXIT_SUCCESS;
 }

core/src/tools/btestls.cc

@@ -29,6 +29,7 @@
 
 #include <unistd.h>
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "include/filetypes.h"
 #include "include/jcr.h"
 #include "findlib/find.h"
@@ -187,7 +188,7 @@ int main(int argc, char* const* argv)
   FreeJcr(jcr);
   RecentJobResultsList::Cleanup();
   CleanupJcrChain();
-  exit(0);
+  exit(BEXIT_SUCCESS);
 }
 
 static int CountFiles(JobControlRecord*, FindFilesPacket*, bool)

core/src/tools/bwild.cc

@@ -26,6 +26,7 @@
  */
 
 #include "include/bareos.h"
+#include "include/exit_codes.h"
 #include "lib/cli.h"
 #include "lib/fnmatch.h"
 
@@ -74,7 +75,7 @@ int main(int argc, char** argv)
     printf("Enter a wild-card: ");
     if (fgets(pat, sizeof(pat) - 1, stdin) == NULL) { break; }
     StripTrailingNewline(pat);
-    if (pat[0] == 0) { exit(0); }
+    if (pat[0] == 0) { exit(BEXIT_SUCCESS); }
     fd = fopen(fname.c_str(), "r");
     if (!fd) {
       printf(_("Could not open data file: %s\n"), fname.c_str());
@@ -95,5 +96,6 @@ int main(int argc, char** argv)
     }
     fclose(fd);
   }
-  exit(0);
+
+  return BEXIT_SUCCESS;
 }