Change copyright as per agreement with FSFE

diff --git a/bacula/src/cats/bvfs.c b/bacula/src/cats/bvfs.c
index 09dee9803a8fd1bc4d037a4dac8cb16d875146b9..ff236cb8b02a5bd934cca6153d11c3ca07955bc5 100644 (file)
--- a/bacula/src/cats/bvfs.c
+++ b/bacula/src/cats/bvfs.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2009-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/cats/cats.c b/bacula/src/cats/cats.c
index ccdedd48bcb9a63302010f62ef648da47f16fe5a..5e19cd546c56f9b4151f3e34abcbcab4cc1aa773 100644 (file)
--- a/bacula/src/cats/cats.c
+++ b/bacula/src/cats/cats.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
  
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
  
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/cats/cats_null.c b/bacula/src/cats/cats_null.c
index 7b83ea7b162ec633ec80b28bada31c77e6d2db2b..f3da1c2e7e0875eb0b193d28c9e5eda258b6dd27 100644 (file)
--- a/bacula/src/cats/cats_null.c
+++ b/bacula/src/cats/cats_null.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c
index ac7561800638fa49b3b6fc8e2229f91067922cff..3ac8af7b416afd5d5a65a2cfcd54babc7e5a88ef 100644 (file)
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index 70d8e6bcb37da822dfee9ee64e0ed734c72fde20..f8fa4a92f87e94f4bfc048adc6dbf86acfa7a89c 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -41,7 +40,7 @@
 #include  "postgres_ext.h"       /* needed for NAMEDATALEN */
 #include  "pg_config_manual.h"   /* get NAMEDATALEN on version 8.3 or later */
 #define __BDB_POSTGRESQL_H_ 1
-#include "bdb_postgresql.h"
+#include  "bdb_postgresql.h"
 
 #define dbglvl_dbg   DT_SQL|100
 #define dbglvl_info  DT_SQL|50
@@ -129,9 +128,7 @@ BDB *db_init_database(JCR *jcr, const char *db_driver, const char *db_name, cons
    mdb = New(BDB_POSTGRESQL());
    if (!mdb) goto get_out;
 
-   /*
-    * Initialize the parent class members.
-    */
+   /* Initialize the parent class members. */
    mdb->m_db_name = bstrdup(db_name);
    mdb->m_db_user = bstrdup(db_user);
    if (db_password) {
@@ -165,7 +162,7 @@ BDB *db_init_database(JCR *jcr, const char *db_driver, const char *db_name, cons
 #endif /* USE_BATCH_FILE_INSERT */ 
    } 
    mdb->m_allow_transactions = mult_db_connections;
-
+ 
    /* At this time, when mult_db_connections == true, this is for
     * specific console command such as bvfs or batch mode, and we don't
     * want to share a batch mode or bvfs. In the future, we can change
@@ -315,7 +312,7 @@ void BDB_POSTGRESQL::bdb_close_database(JCR *jcr)
       db_list->remove(mdb);
       if (mdb->m_connected && mdb->m_db_handle) {
          PQfinish(mdb->m_db_handle);
-      }
+      } 
       if (is_rwl_valid(&mdb->m_lock)) {
          rwl_destroy(&mdb->m_lock);
       } 
@@ -678,7 +675,7 @@ get_out:
 ok_out: 
    return retval; 
 }  
-
+ 
 void BDB_POSTGRESQL::sql_free_result(void)
 {
    BDB_POSTGRESQL *mdb = this;
@@ -743,10 +740,10 @@ SQL_ROW BDB_POSTGRESQL::sql_fetch_row(void)
    Dmsg1(dbglvl_info, "sql_fetch_row finishes returning %p\n", row);
  
    return row; 
-}
+} 
 
 const char *BDB_POSTGRESQL::sql_strerror(void)
-{
+{   
    BDB_POSTGRESQL *mdb = this;
    return PQerrorMessage(mdb->m_db_handle);
 } 

diff --git a/bacula/src/cats/sql_delete.c b/bacula/src/cats/sql_delete.c
index 7a6faa82183b19294236366529734de104527a54..97bff2b8c7134ef037a69940d8de9725034b6e7b 100644 (file)
--- a/bacula/src/cats/sql_delete.c
+++ b/bacula/src/cats/sql_delete.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/cats/sql_find.c b/bacula/src/cats/sql_find.c
index 0a0878cd21ca64d6877dbb45c902cc04cd9e509d..c9b2d5b06099b4b5d0be6fc8ad17f7e7f383ed07 100644 (file)
--- a/bacula/src/cats/sql_find.c
+++ b/bacula/src/cats/sql_find.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 2414a1392a176ebe12d6d6f836ecca364610ef4d..4f60b7f4422b30047515e7be8f2509602b48799b 100644 (file)
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -177,7 +176,6 @@ int BDB::bdb_get_filename_record(JCR *jcr)
 {
    SQL_ROW row;
    int FilenameId = 0;
-   int num_rows;
 
    esc_name = check_pool_memory_size(esc_name, 2*fnl+2);
    bdb_escape_string(jcr, esc_name, fname, fnl);
@@ -185,13 +183,12 @@ int BDB::bdb_get_filename_record(JCR *jcr)
    Mmsg(cmd, "SELECT FilenameId FROM Filename WHERE Name='%s'", esc_name);
    if (QueryDB(jcr, cmd)) {
       char ed1[30];
-      num_rows = sql_num_rows();
-      if (num_rows > 1) {
+      if (sql_num_rows() > 1) { 
          Mmsg2(errmsg, _("More than one Filename!: %s for file: %s\n"),
-            edit_uint64(num_rows, ed1), fname);
+            edit_uint64(sql_num_rows(), ed1), fname);
          Jmsg(jcr, M_WARNING, 0, "%s", errmsg);
       }
-      if (num_rows >= 1) {
+      if (sql_num_rows() >= 1) { 
          if ((row = sql_fetch_row()) == NULL) {
             Mmsg1(errmsg, _("error fetching row: %s\n"), sql_strerror());
          } else {

diff --git a/bacula/src/cats/sql_list.c b/bacula/src/cats/sql_list.c
index 9f237e52af4b3e6e14b5c421783095a830096000..3e89c41a5b797b0a8200e87c080fc53057dd137d 100644 (file)
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 3c051aadce631c480b0010b9da1ca9fcfe3f25b3..f4da1e351fc69bf05427adce6e519dcf7270ba9e 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index 89f810ed0cb36dca52c7c9c410ba3aba42c4f9a7..bed7e627c08a0816622bccee8a0233c533bd4582 100644 (file)
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -2,7 +2,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.