apply bareos-check-sources

bareos · Mar 23, 2023 · bcbada3 · bcbada3
1 parent dd2906f
commit bcbada3
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 134 deletions.
diff --git a/core/scripts/bareos-config-lib.sh.in b/core/scripts/bareos-config-lib.sh.in
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
+#   Copyright (C) 2013-2023 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public

diff --git a/core/src/benchmarks/CMakeLists.txt b/core/src/benchmarks/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2021-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2021-2023 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public

diff --git a/core/src/cats/postgresql.cc b/core/src/cats/postgresql.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2003-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2016 Planets Communications B.V.
-   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -155,10 +155,8 @@ bool BareosDbPostgresql::CheckDatabaseEncoding(JobControlRecord* jcr)
     retval = bstrcmp(row[0], "SQL_ASCII");
 
     if (retval) {
-      /*
-       * If we are in SQL_ASCII, we can force the client_encoding to SQL_ASCII
-       * too
-       */
+      /* If we are in SQL_ASCII, we can force the client_encoding to SQL_ASCII
+       * too */
       SqlQueryWithoutHandler("SET client_encoding TO 'SQL_ASCII'");
     } else {
       // Something is wrong with database encoding
@@ -241,11 +239,9 @@ bool BareosDbPostgresql::OpenDatabase(JobControlRecord* jcr)
   SqlQueryWithoutHandler("SET datestyle TO 'ISO, YMD'");
   SqlQueryWithoutHandler("SET cursor_tuple_fraction=1");
 
-  /*
-   * Tell PostgreSQL we are using standard conforming strings
+  /* Tell PostgreSQL we are using standard conforming strings
    * and avoid warnings such as:
-   *  WARNING:  nonstandard use of \\ in a string literal
-   */
+   *  WARNING:  nonstandard use of \\ in a string literal */
   SqlQueryWithoutHandler("SET standard_conforming_strings=on");
 
   // Check that encoding is SQL_ASCII
@@ -434,10 +430,8 @@ void BareosDbPostgresql::StartTransaction(JobControlRecord* jcr)
     jcr->ar = (AttributesDbRecord*)malloc(sizeof(AttributesDbRecord));
   }
 
-  /*
-   * This is turned off because transactions break
-   * if multiple simultaneous jobs are run.
-   */
+  /* This is turned off because transactions break
+   * if multiple simultaneous jobs are run. */
   if (!allow_transactions_) { return; }
 
   DbLocker _{this};
@@ -626,11 +620,9 @@ bool BareosDbPostgresql::SqlQueryWithoutHandler(const char* query, int)
       }
 
       if (try_reconnect_ && !transaction_) {
-        /*
-         * Only try reconnecting when no transaction is pending.
+        /* Only try reconnecting when no transaction is pending.
          * Reconnecting within a transaction will lead to an aborted
-         * transaction anyway so we better follow our old error path.
-         */
+         * transaction anyway so we better follow our old error path. */
         if (retry) {
           PQreset(db_handle_);
 
@@ -766,8 +758,7 @@ uint64_t BareosDbPostgresql::SqlInsertAutokeyRecord(const char* query,
 
   changes++;
 
-  /*
-   * Obtain the current value of the sequence that
+  /* Obtain the current value of the sequence that
    * provides the serial value for primary key of the table.
    *
    * currval is local to our session.  It is not affected by
@@ -781,8 +772,7 @@ uint64_t BareosDbPostgresql::SqlInsertAutokeyRecord(const char* query,
    * Except for basefiles which has a primary key on baseid.
    * Therefore, we need to special case that one table.
    *
-   * everything else can use the PostgreSQL formula.
-   */
+   * everything else can use the PostgreSQL formula. */
   if (Bstrcasecmp(table_name, "basefiles")) {
     bstrncpy(sequence, "basefiles_baseid", sizeof(sequence));
   } else {

diff --git a/core/src/cats/postgresql.h b/core/src/cats/postgresql.h
@@ -3,7 +3,7 @@
 
    Copyright (C) 2009-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2016-2016 Planets Communications B.V.
-   Copyright (C) 2016-2022 Bareos GmbH & Co. KG
+   Copyright (C) 2016-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -20,8 +20,8 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 */
-#ifndef BAREOS_CATS_BDB_POSTGRESQL_H_
-#define BAREOS_CATS_BDB_POSTGRESQL_H_
+#ifndef BAREOS_CATS_POSTGRESQL_H_
+#define BAREOS_CATS_POSTGRESQL_H_
 
 #include "include/bareos.h"
 
@@ -126,4 +126,4 @@ class BareosDbPostgresql : public BareosDb {
 };
 
 #endif  /* HAVE_POSTGRESQL */
-#endif  // BAREOS_CATS_BDB_POSTGRESQL_H_
+#endif  // BAREOS_CATS_POSTGRESQL_H_
diff --git a/core/src/cats/postgresql_batch.cc b/core/src/cats/postgresql_batch.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2003-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2016 Planets Communications B.V.
-   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public

diff --git a/core/src/dird/check_catalog.cc b/core/src/dird/check_catalog.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2016 Planets Communications B.V.
-   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
+   Copyright (C) 2019-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -48,10 +48,8 @@ bool CheckCatalog(cat_op mode)
   foreach_res (catalog, R_CATALOG) {
     BareosDb* db;
 
-    /*
-     * Make sure we can open catalog, otherwise print a warning
-     * message because the server is probably not running.
-     */
+    /* Make sure we can open catalog, otherwise print a warning
+     * message because the server is probably not running. */
     db = db_init_database(NULL, catalog->db_driver, catalog->db_name,
                           catalog->db_user, catalog->db_password.value,
                           catalog->db_address, catalog->db_port,
@@ -90,10 +88,8 @@ bool CheckCatalog(cat_op mode)
     /* Loop over all pools, defining/updating them in each database */
     PoolResource* pool;
     foreach_res (pool, R_POOL) {
-      /*
-       * If the Pool has a catalog resource create the pool only
-       *   in that catalog.
-       */
+      /* If the Pool has a catalog resource create the pool only
+       *   in that catalog. */
       if (!pool->catalog || pool->catalog == catalog) {
         CreatePool(NULL, db, pool, POOL_OP_UPDATE); /* update request */
       }
@@ -103,10 +99,8 @@ bool CheckCatalog(cat_op mode)
      * references (RecyclePool)
      */
     foreach_res (pool, R_POOL) {
-      /*
-       * If the Pool has a catalog resource update the pool only
-       *   in that catalog.
-       */
+      /* If the Pool has a catalog resource update the pool only
+       *   in that catalog. */
       if (!pool->catalog || pool->catalog == catalog) {
         UpdatePoolReferences(NULL, db, pool);
       }

diff --git a/core/src/dird/dbcheck_utils.h b/core/src/dird/dbcheck_utils.h
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2021-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2021-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public

diff --git a/core/src/dird/dird.cc b/core/src/dird/dird.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2016 Planets Communications B.V.
-   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -434,10 +434,8 @@ extern "C" void SighandlerReloadConfig(int, siginfo_t*, void*)
   static bool is_reloading = false;
 
   if (is_reloading) {
-    /*
-     * Note: don't use Jmsg here, as it could produce a race condition
-     * on multiple parallel reloads
-     */
+    /* Note: don't use Jmsg here, as it could produce a race condition
+     * on multiple parallel reloads */
     Qmsg(nullptr, M_ERROR, 0, _("Already reloading. Request ignored.\n"));
     return;
   }
@@ -454,10 +452,8 @@ static bool InitSighandlerSighup()
   sigset_t block_mask;
   struct sigaction action = {};
 
-  /*
-   *  while handling SIGHUP signal,
-   *  ignore further SIGHUP signals.
-   */
+  /*  while handling SIGHUP signal,
+   *  ignore further SIGHUP signals. */
   sigemptyset(&block_mask);
   sigaddset(&block_mask, SIGHUP);
 

diff --git a/core/src/dird/dird_conf.h b/core/src/dird/dird_conf.h
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2012 Planets Communications B.V.
-   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public