reapply clang-format to changes in branch

bareos · Nov 13, 2019 · b67b222 · b67b222
1 parent 451bd90
commit b67b222
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 35 deletions.
diff --git a/core/src/dird/authenticate.cc b/core/src/dird/authenticate.cc
@@ -229,7 +229,8 @@ bool AuthenticateFileDaemon(BareosSocket* fd, char* client_name)
     sleep(5);
     return false;
   }
-  fd->fsend("1000 OK: %s Version: %s (%s)\n", my_name, kBareosVersionStrings.Full, kBareosVersionStrings.Date);
+  fd->fsend("1000 OK: %s Version: %s (%s)\n", my_name,
+            kBareosVersionStrings.Full, kBareosVersionStrings.Date);
 
   return true;
 }

diff --git a/core/src/dird/authenticate_console.cc b/core/src/dird/authenticate_console.cc
@@ -127,7 +127,8 @@ class ConsoleAuthenticatorBefore_18_2 : public ConsoleAuthenticator {
       if (ua_->UA_sock) {
         return ua_->UA_sock->fsend(_("1000 OK: %s Version: %s (%s) "
                                      "-- %s\n"),
-                                   my_name, kBareosVersionStrings.Full, kBareosVersionStrings.Date, cipher.c_str());
+                                   my_name, kBareosVersionStrings.Full,
+                                   kBareosVersionStrings.Date, cipher.c_str());
       }
     }
     return false;
@@ -205,8 +206,8 @@ bool ConsoleAuthenticatorFrom_18_2::SendResponseMessage(uint32_t response_id,
   std::string message;
   if (send_version_info) {
     char version_info[128];
-    ::snprintf(version_info, 100, "OK: %s Version: %s (%s)", my_name, kBareosVersionStrings.Full,
-               kBareosVersionStrings.Date);
+    ::snprintf(version_info, 100, "OK: %s Version: %s (%s)", my_name,
+               kBareosVersionStrings.Full, kBareosVersionStrings.Date);
     message = version_info;
   }
   return ua_->UA_sock->FormatAndSendResponseMessage(response_id, message);

diff --git a/core/src/dird/ua_cmds.cc b/core/src/dird/ua_cmds.cc
@@ -2806,7 +2806,8 @@ static bool VersionCmd(UaContext* ua, const char* cmd)
   ua->send->ObjectStart("version");
   ua->send->ObjectKeyValue("name", my_name, "%s ");
   ua->send->ObjectKeyValue("type", "bareos-director");
-  ua->send->ObjectKeyValue("Version", "%s: ", kBareosVersionStrings.Full, "%s ");
+  ua->send->ObjectKeyValue("Version", "%s: ", kBareosVersionStrings.Full,
+                           "%s ");
   ua->send->ObjectKeyValue("bdate", kBareosVersionStrings.Date, "(%s) ");
   ua->send->ObjectKeyValue("operatingsystem", HOST_OS, "%s ");
   ua->send->ObjectKeyValue("distname", DISTNAME, "%s ");

diff --git a/core/src/dird/ua_status.cc b/core/src/dird/ua_status.cc
@@ -354,12 +354,14 @@ void ListDirStatusHeader(UaContext* ua)
     dbdrivers.strcat(catalog->db_driver);
     cnt++;
   }
-  ua->SendMsg(_("%s Version: %s (%s) %s %s %s\n"), my_name, kBareosVersionStrings.Full, kBareosVersionStrings.Date,
-              HOST_OS, DISTNAME, DISTVER);
+  ua->SendMsg(_("%s Version: %s (%s) %s %s %s\n"), my_name,
+              kBareosVersionStrings.Full, kBareosVersionStrings.Date, HOST_OS,
+              DISTNAME, DISTVER);
   bstrftime_nc(dt, sizeof(dt), daemon_start_time);
   ua->SendMsg(
       _("Daemon started %s. Jobs: run=%d, running=%d db:%s, %s binary\n"), dt,
-      num_jobs_run, JobCount(), dbdrivers.c_str(), kBareosVersionStrings.BinaryInfo);
+      num_jobs_run, JobCount(), dbdrivers.c_str(),
+      kBareosVersionStrings.BinaryInfo);
 
   if (me->secure_erase_cmdline) {
     ua->SendMsg(_(" secure erase command='%s'\n"), me->secure_erase_cmdline);

diff --git a/core/src/filed/dir_cmd.cc b/core/src/filed/dir_cmd.cc
@@ -1007,10 +1007,13 @@ static bool job_cmd(JobControlRecord* jcr)
 #endif
 
 #if !defined(IS_BUILD_ON_OBS)
-  return dir->fsend(OKjob, kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, os_version, DISTNAME, DISTVER);
+  return dir->fsend(OKjob, kBareosVersionStrings.Full,
+                    kBareosVersionStrings.ShortDate, os_version, DISTNAME,
+                    DISTVER);
 #else
-  return dir->fsend(OKjob, kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, os_version, DISTNAME, DISTVER,
-                    OBS_DISTRIBUTION, OBS_ARCH);
+  return dir->fsend(OKjob, kBareosVersionStrings.Full,
+                    kBareosVersionStrings.ShortDate, os_version, DISTNAME,
+                    DISTVER, OBS_DISTRIBUTION, OBS_ARCH);
 #endif
 }
 

diff --git a/core/src/filed/status.cc b/core/src/filed/status.cc
@@ -90,8 +90,9 @@ static void ListStatusHeader(StatusPacket* sp)
   char buf[300];
 #endif
 
-  len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"), my_name, kBareosVersionStrings.Date,
-             kBareosVersionStrings.Date, VSS, HOST_OS, DISTNAME, DISTVER);
+  len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"), my_name,
+             kBareosVersionStrings.Date, kBareosVersionStrings.Date, VSS,
+             HOST_OS, DISTNAME, DISTVER);
   sendit(msg, len, sp);
   bstrftime_nc(dt, sizeof(dt), daemon_start_time);
   len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d, %s binary\n"),

diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -343,7 +343,8 @@ bool BareosSocket::ConsoleAuthenticateWithDirector(
 
   dir->StartTimer(60 * 5); /* 5 minutes */
   dir->InitBnetDump(own_qualified_name);
-  dir->fsend("Hello %s calling version %s\n", bashed_name, kBareosVersionStrings.Full);
+  dir->fsend("Hello %s calling version %s\n", bashed_name,
+             kBareosVersionStrings.Full);
 
   if (!AuthenticateOutboundConnection(jcr, own_qualified_name, identity,
                                       password, tls_resource)) {

diff --git a/core/src/lib/version.c b/core/src/lib/version.c
@@ -75,9 +75,10 @@
 
 static void FormatCopyright(char* out, size_t len, int FsfYear)
 {
-  snprintf(out, len, BAREOS_COPYRIGHT_MESSAGE, kBareosVersionStrings.ServicesMessage,
-           kBareosVersionStrings.Year, FsfYear, kBareosVersionStrings.Full,
-           kBareosVersionStrings.Date, HOST_OS, DISTNAME, DISTVER);
+  snprintf(out, len, BAREOS_COPYRIGHT_MESSAGE,
+           kBareosVersionStrings.ServicesMessage, kBareosVersionStrings.Year,
+           FsfYear, kBareosVersionStrings.Full, kBareosVersionStrings.Date,
+           HOST_OS, DISTNAME, DISTVER);
 }
 static void PrintCopyright(FILE* fh, int FsfYear)
 {
@@ -98,4 +99,3 @@ const struct BareosVersionStrings kBareosVersionStrings = {
     .JoblogMessage = BAREOS_JOBLOG_MESSAGE,
     .FormatCopyright = FormatCopyright,
     .PrintCopyright = PrintCopyright};
-
diff --git a/core/src/qt-tray-monitor/tray-monitor.cc b/core/src/qt-tray-monitor/tray-monitor.cc
@@ -45,20 +45,24 @@ static QCoreApplication* app = nullptr;
 static void usage()
 {
   std::vector<char> copyright(1024);
-  kBareosVersionStrings.FormatCopyright(copyright.data(), copyright.size(), 2004);
-  QString out = QString(
-      _("%1"
-        "Usage: tray-monitor [options]\n"
-        "        -c <path>   use <path> as configuration file or directory\n"
-        "        -d <nn>     set debug level to <nn>\n"
-        "        -dt         print timestamp in debug output\n"
-        "        -t          test - read configuration and exit\n"
-        "        -rc         test - do connection test\n"
-        "        -xc         print configuration and exit\n"
-        "        -xs         print configuration file schema in JSON format "
-        "and exit\n"
-        "        -?          print this message.\n"
-        "\n")).arg(copyright.data());
+  kBareosVersionStrings.FormatCopyright(copyright.data(), copyright.size(),
+                                        2004);
+  QString out =
+      QString(_("%1"
+                "Usage: tray-monitor [options]\n"
+                "        -c <path>   use <path> as configuration file or "
+                "directory\n"
+                "        -d <nn>     set debug level to <nn>\n"
+                "        -dt         print timestamp in debug output\n"
+                "        -t          test - read configuration and exit\n"
+                "        -rc         test - do connection test\n"
+                "        -xc         print configuration and exit\n"
+                "        -xs         print configuration file schema in JSON "
+                "format "
+                "and exit\n"
+                "        -?          print this message.\n"
+                "\n"))
+          .arg(copyright.data());
 
 #if HAVE_WIN32
   QMessageBox::information(0, "Help", out);

diff --git a/core/src/stored/status.cc b/core/src/stored/status.cc
@@ -445,8 +445,9 @@ static void ListStatusHeader(StatusPacket* sp)
   char buf[300];
 #endif
 
-  len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s\n"), my_name, kBareosVersionStrings.Full, kBareosVersionStrings.Date,
-             HOST_OS, DISTNAME, DISTVER);
+  len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s\n"), my_name,
+             kBareosVersionStrings.Full, kBareosVersionStrings.Date, HOST_OS,
+             DISTNAME, DISTVER);
   sendit(msg, len, sp);
 
   bstrftime_nc(dt, sizeof(dt), daemon_start_time);

diff --git a/core/src/tests/bsock_test.cc b/core/src/tests/bsock_test.cc
@@ -128,7 +128,8 @@ static void start_bareos_server(std::promise<bool>* promise,
                                            dir_cons_config.get())) {
       Dmsg0(10, "Server: inbound auth failed\n");
     } else {
-      bs->fsend(_("1000 OK: %s Version: %s (%s)\n"), my_name, kBareosVersionStrings.Full, kBareosVersionStrings.Date);
+      bs->fsend(_("1000 OK: %s Version: %s (%s)\n"), my_name,
+                kBareosVersionStrings.Full, kBareosVersionStrings.Date);
       Dmsg0(10, "Server: inbound auth successful\n");
       std::string cipher;
       if (bs->tls_conn) {