Change copyright as per agreement with FSFE

diff --git a/bacula/src/cats/bdb.h b/bacula/src/cats/bdb.h
index 87b260be03158c806e380e255db069a0b68bcf0d..ae4770ba92bc6dacea1a9edbb5e43cd74c1b3071 100644 (file)
--- a/bacula/src/cats/bdb.h
+++ b/bacula/src/cats/bdb.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2015 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/bdb_mysql.h b/bacula/src/cats/bdb_mysql.h
index d260a76a3ee48cf33509820800625d4f9d127507..ac0d167c71bc17fcba507c1672159adaed555b78 100644 (file)
--- a/bacula/src/cats/bdb_mysql.h
+++ b/bacula/src/cats/bdb_mysql.h
@@ -1,71 +1,70 @@
-/*
+/* 
    Bacula(R) - The Network Backup Solution
-
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2009-2014 Free Software Foundation Europe e.V.
-
+ 
+   Copyright (C) 2000-2016 Kern Sibbald
+ 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
-
+ 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
-
+ 
    This notice must be preserved when any source code is 
    conveyed and/or propagated.
-
+ 
    Bacula(R) is a registered trademark of Kern Sibbald.
-*/
-
+*/ 
+  
 /* MySQL driver specific definitions */
-
-#ifdef __BDB_MYSQL_H_
-
-/*
- * Number of insert statements to batch-up in batch insert
- * mode. We use multi-row inserts only in the batch mode
- * on the private database connection.
- */
-#define MYSQL_CHANGES_PER_BATCH_INSERT 32
-
+ 
+#ifdef BDB_MYSQL_H_
+ 
+/* 
+ * Number of insert statements to batch-up in batch insert 
+ * mode. We use multi-row inserts only in the batch mode 
+ * on the private database connection. 
+ */ 
+#define MYSQL_CHANGES_PER_BATCH_INSERT  32
+ 
 class BDB_MYSQL: public BDB {
-private:
-   MYSQL *m_db_handle;
-   MYSQL m_instance;
-   MYSQL_RES *m_result;
-
-public:
-   BDB_MYSQL();
-   ~BDB_MYSQL();
-
-   /* Functions that we override */
-   bool bdb_open_database(JCR *jcr);
-   void bdb_close_database(JCR *jcr);
-   void bdb_thread_cleanup(void);
-   void bdb_escape_string(JCR *jcr, char *snew, char *old, int len);
-   char *bdb_escape_object(JCR *jcr, char *old, int len);
-   void bdb_unescape_object(JCR *jcr, char *from, int32_t expected_len,
-                           POOLMEM **dest, int32_t *len);
-   void bdb_start_transaction(JCR *jcr);
-   void bdb_end_transaction(JCR *jcr);
-   bool bdb_sql_query(const char *query, DB_RESULT_HANDLER *result_handler, void *ctx);
-   void sql_free_result(void);
-   SQL_ROW sql_fetch_row(void);
-   bool sql_query(const char *query, int flags=0);
-   const char *sql_strerror(void);
-   int sql_num_rows(void);
-   void sql_data_seek(int row);
-   int sql_affected_rows(void);
-   uint64_t sql_insert_autokey_record(const char *query, const char *table_name);
-   void sql_field_seek(int field);
-   SQL_FIELD *sql_fetch_field(void);
-   int sql_num_fields(void);
-   bool sql_field_is_not_null(int field_type);
-   bool sql_field_is_numeric(int field_type);
-   bool sql_batch_start(JCR *jcr);
-   bool sql_batch_end(JCR *jcr, const char *error);
-   bool sql_batch_insert(JCR *jcr, ATTR_DBR *ar);
-};
-
-#endif /* __BDB_MYSQL_H_ */
+private: 
+    MYSQL *m_db_handle;
+    MYSQL m_instance;
+    MYSQL_RES *m_result;
+ 
+public: 
+    BDB_MYSQL();
+    ~BDB_MYSQL();
+  
+    /* Functions that we override */
+    bool bdb_open_database(JCR *jcr);
+    void bdb_close_database(JCR *jcr);
+    void bdb_thread_cleanup(void);
+    void bdb_escape_string(JCR *jcr, char *snew, char *old, int len);
+    char *bdb_escape_object(JCR *jcr, char *old, int len);
+    void bdb_unescape_object(JCR *jcr, char *from, int32_t expected_len,
+                             POOLMEM **dest, int32_t *len);
+    void bdb_start_transaction(JCR *jcr);
+    void bdb_end_transaction(JCR *jcr);
+    bool bdb_sql_query(const char *query, DB_RESULT_HANDLER *result_handler, void *ctx);
+    void sql_free_result(void);
+    SQL_ROW sql_fetch_row(void);
+    bool sql_query(const char *query, int flags=0);
+    const char *sql_strerror(void);
+    int sql_num_rows(void);
+    void sql_data_seek(int row);
+    int sql_affected_rows(void);
+    uint64_t sql_insert_autokey_record(const char *query, const char *table_name);
+    void sql_field_seek(int field);
+    SQL_FIELD *sql_fetch_field(void);
+    int sql_num_fields(void);
+    bool sql_field_is_not_null(int field_type);
+    bool sql_field_is_numeric(int field_type);
+    bool sql_batch_start(JCR *jcr);
+    bool sql_batch_end(JCR *jcr, const char *error);
+    bool sql_batch_insert(JCR *jcr, ATTR_DBR *ar);
+}; 
+ 
+#endif  /* BDB_MYSQL_H_ */

diff --git a/bacula/src/cats/bvfs.c b/bacula/src/cats/bvfs.c
index ff236cb8b02a5bd934cca6153d11c3ca07955bc5..372149ef1a01a45203d0a91a7efa70ead3bffc7c 100644 (file)
--- a/bacula/src/cats/bvfs.c
+++ b/bacula/src/cats/bvfs.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/bvfs.h b/bacula/src/cats/bvfs.h
index 7f792ace00d6a9f45ddad7ff40d57eddcd9b215e..5eb8f0ae4b802299ae660a79067167fae03fc020 100644 (file)
--- a/bacula/src/cats/bvfs.h
+++ b/bacula/src/cats/bvfs.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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 5e19cd546c56f9b4151f3e34abcbcab4cc1aa773..3cfbaedad937e69c6758ace0447f5dfeb8f6f1c9 100644 (file)
--- a/bacula/src/cats/cats.c
+++ b/bacula/src/cats/cats.c
@@ -1,7 +1,7 @@
 /* 
    Bacula(R) - The Network Backup Solution
  
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
  
    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.h b/bacula/src/cats/cats.h
index 2908f152f572619d050f5354b37fa6147c96e7f3..e2d48f6ae2267679086b0e3cac5ad4cc1cabf04a 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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 f3da1c2e7e0875eb0b193d28c9e5eda258b6dd27..f5c360ac947ebf66b4204d4a2280d31109fd7428 100644 (file)
--- a/bacula/src/cats/cats_null.c
+++ b/bacula/src/cats/cats_null.c
@@ -1,7 +1,7 @@
 /* 
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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 3ac8af7b416afd5d5a65a2cfcd54babc7e5a88ef..d722bf4d8ea0e443837707f417662483900d3c2e 100644 (file)
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -1,7 +1,7 @@
 /* 
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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 f8fa4a92f87e94f4bfc048adc6dbf86acfa7a89c..51d1a13fedd50ae500fb0592f0e390ff0244481a 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/protos.h b/bacula/src/cats/protos.h
index 61c9119c18995571960f024e847c5da5910bc273..e6a9c220a8f3a9f852962e5b77302dc8b627a2e0 100644 (file)
--- a/bacula/src/cats/protos.h
+++ b/bacula/src/cats/protos.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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.c b/bacula/src/cats/sql.c
index 4b1278d2aa19ffccd2586a3596a08d9d3f3b70af..e241d09efdd80b6bc397fa187147b372260a8a51 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -1,8 +1,7 @@
 /* 
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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_cmds.h b/bacula/src/cats/sql_cmds.h
index 1d8602b0ebae264c46753c1a50acd999d052733a..43ded93f50a2611027b2d8e0c1a25a21fef53a9b 100644 (file)
--- a/bacula/src/cats/sql_cmds.h
+++ b/bacula/src/cats/sql_cmds.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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_create.c b/bacula/src/cats/sql_create.c
index 9a84a49c334dc7cb01b35ab6280df86f5af053cd..047c65057c45a15338b5a7efe7cc099bb592e7f3 100644 (file)
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -971,7 +971,6 @@ int BDB::bdb_create_file_record(JCR *jcr, ATTR_DBR *ar)
 int BDB::bdb_create_filename_record(JCR *jcr, ATTR_DBR *ar)
 {
    SQL_ROW row;
-   int num_rows;
 
    errmsg[0] = 0;
    esc_name = check_pool_memory_size(esc_name, 2*fnl+2);
@@ -980,14 +979,13 @@ int BDB::bdb_create_filename_record(JCR *jcr, ATTR_DBR *ar)
    Mmsg(cmd, "SELECT FilenameId FROM Filename WHERE Name='%s'", esc_name);
 
    if (QueryDB(jcr, cmd)) {
-      num_rows = sql_num_rows();
-      if (num_rows > 1) {
+      if (sql_num_rows() > 1) {
          char ed1[30];
          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) {
             Mmsg2(&errmsg, _("Error fetching row for file=%s: ERR=%s\n"),
                 fname, sql_strerror());

diff --git a/bacula/src/cats/sql_delete.c b/bacula/src/cats/sql_delete.c
index 97bff2b8c7134ef037a69940d8de9725034b6e7b..b52c3796515c9dd469f0639efe5e6538ebf16c23 100644 (file)
--- a/bacula/src/cats/sql_delete.c
+++ b/bacula/src/cats/sql_delete.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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 c9b2d5b06099b4b5d0be6fc8ad17f7e7f383ed07..8adba6c32b3075ed700b31e2120c7418f9500650 100644 (file)
--- a/bacula/src/cats/sql_find.c
+++ b/bacula/src/cats/sql_find.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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 4f60b7f4422b30047515e7be8f2509602b48799b..cfdb4151e131c1c548dc2ced8aebb49a97ceb0a7 100644 (file)
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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_list.c b/bacula/src/cats/sql_list.c
index fbba97a1fb4d7abe88e0d83b9274c6d4588be383..309e0db6b5709ec4c48d4ba8274c3a929b18a892 100644 (file)
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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 f4da1e351fc69bf05427adce6e519dcf7270ba9e..205a6d3a728db45c940f250118b0b00f3fea83c6 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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 bed7e627c08a0816622bccee8a0233c533bd4582..7dcbafe7f0258406f2c0c84205e7cc80d228d708 100644 (file)
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -1,7 +1,7 @@
 /* 
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/bat.h b/bacula/src/qt-console/bat.h
index 214ac7d7939d7306b96a96e422fec219efa348f2..5280d189c1ac48a2602cf2562722de7acf4f3ff1 100644 (file)
--- a/bacula/src/qt-console/bat.h
+++ b/bacula/src/qt-console/bat.h
@@ -4,8 +4,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/bat_conf.cpp b/bacula/src/qt-console/bat_conf.cpp
index 429cf4d8f3147a87b7975079772565ab96e93a24..0f8dcc2c9bda16a8477045eb7fa0fafc5d4108ad 100644 (file)
--- a/bacula/src/qt-console/bat_conf.cpp
+++ b/bacula/src/qt-console/bat_conf.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2013 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/bat_conf.h b/bacula/src/qt-console/bat_conf.h
index 143168c4bdd1b943ee1c124652f413704342da64..7fa7a19951d1a8c8ab13ebd85c2902f4e1350c28 100644 (file)
--- a/bacula/src/qt-console/bat_conf.h
+++ b/bacula/src/qt-console/bat_conf.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index 55910641fc868ff7fa091b947055ba5c2f9b334b..d9e22a0e735d7ff2dfee72204bb6a7a4a3552ee0 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/bcomm/dircomm.h b/bacula/src/qt-console/bcomm/dircomm.h
index 5d6446116a1c5285418d031cea1ad65d1afaea9a..54ce58dc65fddf74f728397b15ef3c64b7cf9095 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.h
+++ b/bacula/src/qt-console/bcomm/dircomm.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/bcomm/dircomm_auth.cpp b/bacula/src/qt-console/bcomm/dircomm_auth.cpp
index 32ac44cff6c0d7921bcf3d7b6a9ad3d3d964a178..8c24ca31b7e9dce84da2c6e8d7265c789c07cf53 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm_auth.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm_auth.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2013 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index b9c2ea804d806057f8e89eb602877bc8b58182b7..37f288a94f0fb943a02cdd730846353ed68fa28e 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/clients/clients.h b/bacula/src/qt-console/clients/clients.h
index cbb593ec30c926a3728fe3e7aba71e24b44d7fd9..4ecdc00260de28e9bd27e3b04e5fb55eeaf4a416 100644 (file)
--- a/bacula/src/qt-console/clients/clients.h
+++ b/bacula/src/qt-console/clients/clients.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index eb8ef45669bdf5e7eb0b2ca05e900be4e7a0650a..a183b919ecb016e340e929dc4f0950281402b397 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/console/console.h b/bacula/src/qt-console/console/console.h
index e5e6c3a27d227492ffcf592b2cc5d760b7b67907..0468676dad46f56f7b7b1866ecebcd171ab080ac 100644 (file)
--- a/bacula/src/qt-console/console/console.h
+++ b/bacula/src/qt-console/console/console.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index 1a8a3f97fd99fd78172a6c4407704e0af26d9f59..5287c9416eb484db267464c731acf03b18d0c6bc 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/fileset/fileset.h b/bacula/src/qt-console/fileset/fileset.h
index 90f33b0733f226aee44c4f76ce7597acfee26158..c6f431af07b4daaeec9615421176b61792c7fa04 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.h
+++ b/bacula/src/qt-console/fileset/fileset.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/help/help.cpp b/bacula/src/qt-console/help/help.cpp
index 3e99563e7f33e1408e4d45122f175a9cfd52e4ec..2967ce1bed2404b230764e476ec0da1bf7a76bbd 100644 (file)
--- a/bacula/src/qt-console/help/help.cpp
+++ b/bacula/src/qt-console/help/help.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/help/help.h b/bacula/src/qt-console/help/help.h
index 3d11ef78bf66b0fe3c36e3e909775e0b33543ac5..c6e0ff5d838a464b5cbb9bd7fb388d774eb6f554 100644 (file)
--- a/bacula/src/qt-console/help/help.h
+++ b/bacula/src/qt-console/help/help.h
@@ -4,8 +4,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/job/job.cpp b/bacula/src/qt-console/job/job.cpp
index 515ed4739ebf3c7306cc9cb9391705d2395512e9..67ad1b4cd2c82e1b8301d6c4228e1eebba5ca626 100644 (file)
--- a/bacula/src/qt-console/job/job.cpp
+++ b/bacula/src/qt-console/job/job.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/job/job.h b/bacula/src/qt-console/job/job.h
index 44d328a0c7fe5bbbfb07cdd16883b06eb2ac1ffc..7f14463f698cfecb90bb76cdb59ee35dd5680f72 100644 (file)
--- a/bacula/src/qt-console/job/job.h
+++ b/bacula/src/qt-console/job/job.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/jobgraphs/jobplot.cpp b/bacula/src/qt-console/jobgraphs/jobplot.cpp
index 1b14e41b2467bce261bf8ac678c7fee274397219..abb0b4608d6189430e649af620e4568a67d57e14 100644 (file)
--- a/bacula/src/qt-console/jobgraphs/jobplot.cpp
+++ b/bacula/src/qt-console/jobgraphs/jobplot.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/jobgraphs/jobplot.h b/bacula/src/qt-console/jobgraphs/jobplot.h
index 4297b4be4cb390bb6f614526a35616fe5052780a..86a604890347925d1aa2057165d6703aa81a7e95 100644 (file)
--- a/bacula/src/qt-console/jobgraphs/jobplot.h
+++ b/bacula/src/qt-console/jobgraphs/jobplot.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index 4afbb68fc575073850bda67e5a945295b8ba4f3c..4440722a12cc418871cdfefdba16dd32a3cc1813 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/joblist/joblist.h b/bacula/src/qt-console/joblist/joblist.h
index 1a154ba13405c86744ddb75f4d6802fc10eb624f..bc417626eb240649e2e363636e79859f6db963d3 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.h
+++ b/bacula/src/qt-console/joblist/joblist.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/joblog/joblog.cpp b/bacula/src/qt-console/joblog/joblog.cpp
index 11d8bb98441eb362f897b29e3740cca181c1a7dc..46ae5546fda0d09632fb9c3e1dad39b6a3f3029e 100644 (file)
--- a/bacula/src/qt-console/joblog/joblog.cpp
+++ b/bacula/src/qt-console/joblog/joblog.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/joblog/joblog.h b/bacula/src/qt-console/joblog/joblog.h
index 27d6bbb3f91190550c144c6014768caa4a549b41..255276e4280c4b0f202804bddb88e988bf5f9c8d 100644 (file)
--- a/bacula/src/qt-console/joblog/joblog.h
+++ b/bacula/src/qt-console/joblog/joblog.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/jobs/jobs.cpp b/bacula/src/qt-console/jobs/jobs.cpp
index edb621788bc6774605ad97ee9af2f51929031e08..a6df56e86145d298c8d438c7d766d5c8210d243b 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.cpp
+++ b/bacula/src/qt-console/jobs/jobs.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/jobs/jobs.h b/bacula/src/qt-console/jobs/jobs.h
index 425a398ac30452cb46f174852a492fc3af533907..8622c95e111219854f6f3ebd29add44dd8ab0fb7 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.h
+++ b/bacula/src/qt-console/jobs/jobs.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/label/label.cpp b/bacula/src/qt-console/label/label.cpp
index fae53a770a1cc58c7301df96100742bdd3bb6a39..664d0e50c5e40b64f014c1a1a5117af1c5e944cb 100644 (file)
--- a/bacula/src/qt-console/label/label.cpp
+++ b/bacula/src/qt-console/label/label.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/label/label.h b/bacula/src/qt-console/label/label.h
index ff876374014495ce90c6b8660549a5c87a255ddd..1fa741525603b16b6337d844219c2d0d6b7abe8a 100644 (file)
--- a/bacula/src/qt-console/label/label.h
+++ b/bacula/src/qt-console/label/label.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 9e8c723be1607d698201976e862a088aca9b2461..162e2c5ed5dc866d87b84004a273f78f0e4b0ffa 100644 (file)
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 835f7156bafd6d4268d1d50c546f6d1d1ede8539..27d477d9b1091ac709608a09136fd36de2a3e87e 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/mainwin.h b/bacula/src/qt-console/mainwin.h
index 3d96e76b7086aa0b973ac2c35874301d00a0f43b..a88c79deb246b0325d9c97d7905aa50f6e420836 100644 (file)
--- a/bacula/src/qt-console/mainwin.h
+++ b/bacula/src/qt-console/mainwin.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/mediaedit/mediaedit.cpp b/bacula/src/qt-console/mediaedit/mediaedit.cpp
index 783c6da24671db56f6ac70474a4cd0f2d5a55b9f..9662e376efaa8a390346aa16347ad35ef00abb94 100644 (file)
--- a/bacula/src/qt-console/mediaedit/mediaedit.cpp
+++ b/bacula/src/qt-console/mediaedit/mediaedit.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/mediaedit/mediaedit.h b/bacula/src/qt-console/mediaedit/mediaedit.h
index 7aa986e45f95d7f67b408fbb013cce13483f2746..5856f3080165e3bde951e68dbe9b5360f3cd9c73 100644 (file)
--- a/bacula/src/qt-console/mediaedit/mediaedit.h
+++ b/bacula/src/qt-console/mediaedit/mediaedit.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/mediainfo/mediainfo.cpp b/bacula/src/qt-console/mediainfo/mediainfo.cpp
index 6184d4017ca65ed4a1ec4674be8fb031fd342b3e..e6cb853573402d37f0fe5e6d09225e9072bfa8f0 100644 (file)
--- a/bacula/src/qt-console/mediainfo/mediainfo.cpp
+++ b/bacula/src/qt-console/mediainfo/mediainfo.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/mediainfo/mediainfo.h b/bacula/src/qt-console/mediainfo/mediainfo.h
index 0e64d5dd75435f5f22a9fac4d7b2bc9d57bfb44f..af5d5b8124d36390a943bb1b1ff7f1caa543d53a 100644 (file)
--- a/bacula/src/qt-console/mediainfo/mediainfo.h
+++ b/bacula/src/qt-console/mediainfo/mediainfo.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index e9adb2a52af293be3d19bf927629022c29ae1a82..b8a255f1a57984508f4b732b80b35e2317c0c3af 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/medialist/medialist.h b/bacula/src/qt-console/medialist/medialist.h
index 78505401180c624fdacecf342ee22953761a110b..0c3f674352fa69b3c412050a46fe89ae97d2f540 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.h
+++ b/bacula/src/qt-console/medialist/medialist.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/medialist/mediaview.cpp b/bacula/src/qt-console/medialist/mediaview.cpp
index 5650a264a973e48105ef45783edffc631b873015..8636e8369f7023012c03afa031ad1e37678e69ef 100644 (file)
--- a/bacula/src/qt-console/medialist/mediaview.cpp
+++ b/bacula/src/qt-console/medialist/mediaview.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -108,7 +107,7 @@ void MediaView::purgePushed()
 bool MediaView::getSelection(QStringList &list)
 {
    QTableWidgetItem *it;
-   QList<QTableWidgetItem*> items = m_tableMedia->selectedItems();
+   QList<QTableWidgetItem*> items = m_tableMedia->selectedItems(); 
    int row;
    int nrows;                      /* number of rows */
    bool *tab;
@@ -122,7 +121,7 @@ bool MediaView::getSelection(QStringList &list)
    for (int i = 0; i < nb; ++i) {
       row = items[i]->row();
       if (!tab[row]) {
-         tab[row] = true;
+         tab[row] = true; 
          it = m_tableMedia->item(row, 0);
          list.append(it->text());
       }

diff --git a/bacula/src/qt-console/medialist/mediaview.h b/bacula/src/qt-console/medialist/mediaview.h
index 0b4171767358990227c4392ef38ddb57bb9b82a8..e2808c0519740417af60a98079e1d5886ae95eae 100644 (file)
--- a/bacula/src/qt-console/medialist/mediaview.h
+++ b/bacula/src/qt-console/medialist/mediaview.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/mount/mount.cpp b/bacula/src/qt-console/mount/mount.cpp
index 475e486ba7969334ab5c5e6c1378c6c84c4fc6d0..2d466e19e8752edb377fcf8b8d7386e75ce21950 100644 (file)
--- a/bacula/src/qt-console/mount/mount.cpp
+++ b/bacula/src/qt-console/mount/mount.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/mount/mount.h b/bacula/src/qt-console/mount/mount.h
index 9706d2b049064735ad90fcd8454388e7733ef1b3..4703c981f8a23574775bcbedf6839568d899cb1a 100644 (file)
--- a/bacula/src/qt-console/mount/mount.h
+++ b/bacula/src/qt-console/mount/mount.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index d21a76e5d488db46ac5d1b3f95ea3d86c9df98cb..05713da4ba7c993ead526c24adf504beeb9d1348 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/pages.h b/bacula/src/qt-console/pages.h
index 997207a58907729c16004f887b4b15b297fe4d08..4c5ef5dfec538f5959f4c98ffbce75df266d1540 100644 (file)
--- a/bacula/src/qt-console/pages.h
+++ b/bacula/src/qt-console/pages.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/relabel/relabel.cpp b/bacula/src/qt-console/relabel/relabel.cpp
index aeace6c4f87f590ec67cdfed3a099c73858aec3d..b416f7a33e392de0d6c059bfcd1086187e2e4373 100644 (file)
--- a/bacula/src/qt-console/relabel/relabel.cpp
+++ b/bacula/src/qt-console/relabel/relabel.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/relabel/relabel.h b/bacula/src/qt-console/relabel/relabel.h
index 746ba3c8ab554b1454893e901e6178567777088e..105d6275706892f0b6b8444771e4855a7121f8b6 100644 (file)
--- a/bacula/src/qt-console/relabel/relabel.h
+++ b/bacula/src/qt-console/relabel/relabel.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/restore/brestore.cpp b/bacula/src/qt-console/restore/brestore.cpp
index 7503fb26c582158c760dcab51c035edee152d9cc..341a99848850938dd63fd6fc0379ddc2422a27e9 100644 (file)
--- a/bacula/src/qt-console/restore/brestore.cpp
+++ b/bacula/src/qt-console/restore/brestore.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index 482c8d1dfc498da6a3746389bf67de0a2c768796..88c67fccd41fe73a2298920b321d46efe0a45633 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp
index 70cc2992e3eb365dee148172c7bf26b7ec632ff3..c8c0770f4cd48ff277e67dacddf13f1c48f7e30a 100644 (file)
--- a/bacula/src/qt-console/restore/restore.cpp
+++ b/bacula/src/qt-console/restore/restore.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/restore/restore.h b/bacula/src/qt-console/restore/restore.h
index 87106350025aed331486a55118b825559b7ee52c..7ece0af40059afa1db1cc113f4a4ee5ecd493961 100644 (file)
--- a/bacula/src/qt-console/restore/restore.h
+++ b/bacula/src/qt-console/restore/restore.h
@@ -4,8 +4,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp
index 0bc9172d3de38cfa243911a3743a686829bcb023..d32270cf583f0cb44e7e3bfe0230baec84bf3f64 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.cpp
+++ b/bacula/src/qt-console/restore/restoretree.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/restore/restoretree.h b/bacula/src/qt-console/restore/restoretree.h
index ae39d3c340c6ec9f0d1fb391f332b805195ef348..74b9f2fe4e9eaf19bc4918fe9c7e58be8aebb7bb 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.h
+++ b/bacula/src/qt-console/restore/restoretree.h
@@ -4,8 +4,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/run/estimate.cpp b/bacula/src/qt-console/run/estimate.cpp
index 9aa894e37a41950319aed03327c3f9e35b0d8a9c..8a31697f58a4810daaeaf3d10797db161a300718 100644 (file)
--- a/bacula/src/qt-console/run/estimate.cpp
+++ b/bacula/src/qt-console/run/estimate.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/run/prune.cpp b/bacula/src/qt-console/run/prune.cpp
index 94e08c7e76e05c29b15674836663782f1ec65972..64955770acc45e27ef2ee33473f700d9decbe03d 100644 (file)
--- a/bacula/src/qt-console/run/prune.cpp
+++ b/bacula/src/qt-console/run/prune.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/run/run.cpp b/bacula/src/qt-console/run/run.cpp
index a86f526829734ca42d1819680d7855a53d2a7a37..c8199e5ef92d7a53cbb064cb6ffdaad72c4057a4 100644 (file)
--- a/bacula/src/qt-console/run/run.cpp
+++ b/bacula/src/qt-console/run/run.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/run/run.h b/bacula/src/qt-console/run/run.h
index 59d037b03f31ea0a6ca73ca995f0f4c7b1001750..ad9329c5248fcf9c74e171485784579bfbfff566 100644 (file)
--- a/bacula/src/qt-console/run/run.h
+++ b/bacula/src/qt-console/run/run.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/run/runcmd.cpp b/bacula/src/qt-console/run/runcmd.cpp
index 6ce39cefbe91803ab3a0ebb4a18abf2f844c258b..c7616b0af1d9c816cb6fa5eaef342e5083428b53 100644 (file)
--- a/bacula/src/qt-console/run/runcmd.cpp
+++ b/bacula/src/qt-console/run/runcmd.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/select/select.cpp b/bacula/src/qt-console/select/select.cpp
index 8d628de687a654f1f8c662e9275b1f5adc760356..f026920ca1236142163ebd9d54817a11511ff67e 100644 (file)
--- a/bacula/src/qt-console/select/select.cpp
+++ b/bacula/src/qt-console/select/select.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/select/select.h b/bacula/src/qt-console/select/select.h
index a4377fc7bbb8bff3cd1727549ae7f4a888a650db..4589cc013a520e5294c7caad68f32ea20c61b5e2 100644 (file)
--- a/bacula/src/qt-console/select/select.h
+++ b/bacula/src/qt-console/select/select.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/select/textinput.cpp b/bacula/src/qt-console/select/textinput.cpp
index 691f646bea85d8e04563ca67c494889d58f2e5aa..a32e1ff242d168c7fd193f6c1e3298343b40759f 100644 (file)
--- a/bacula/src/qt-console/select/textinput.cpp
+++ b/bacula/src/qt-console/select/textinput.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/select/textinput.h b/bacula/src/qt-console/select/textinput.h
index 83fb93e05f9d907e638c192869ca0fc92fbd95b5..5165de9c2614b0a2bdba69a34422049e808b247a 100644 (file)
--- a/bacula/src/qt-console/select/textinput.h
+++ b/bacula/src/qt-console/select/textinput.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/status/clientstat.cpp b/bacula/src/qt-console/status/clientstat.cpp
index 97393a9c5ecbf1ca00c4183bff910612e5a22e19..d11ae9777562a84c0b6a933bf5538b03525bb25f 100644 (file)
--- a/bacula/src/qt-console/status/clientstat.cpp
+++ b/bacula/src/qt-console/status/clientstat.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/status/clientstat.h b/bacula/src/qt-console/status/clientstat.h
index f88dfa917f118810ffa07f940ec3e7cefc991db7..eb44b38e9b06afa1347754210986e437a7e08bbb 100644 (file)
--- a/bacula/src/qt-console/status/clientstat.h
+++ b/bacula/src/qt-console/status/clientstat.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/status/dirstat.cpp b/bacula/src/qt-console/status/dirstat.cpp
index 1747f4cb7b7ea804bb95a0705ee6bf5c22a73b27..e7db91d20d8bf443ac9ccce89b1244950eef4c74 100644 (file)
--- a/bacula/src/qt-console/status/dirstat.cpp
+++ b/bacula/src/qt-console/status/dirstat.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/status/dirstat.h b/bacula/src/qt-console/status/dirstat.h
index c83c918583a2e728b1c9156ac2097292395937b9..f99634c3bd41da2e9b2acae50397a88a4a362da1 100644 (file)
--- a/bacula/src/qt-console/status/dirstat.h
+++ b/bacula/src/qt-console/status/dirstat.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/status/storstat.cpp b/bacula/src/qt-console/status/storstat.cpp
index 86eff959162d523fee257c622dbfdc9093d1295d..5eb326eeafe04a0ac319d354205bcc5ad0854db8 100644 (file)
--- a/bacula/src/qt-console/status/storstat.cpp
+++ b/bacula/src/qt-console/status/storstat.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/status/storstat.h b/bacula/src/qt-console/status/storstat.h
index 55bd74a259e2d3dbc0947bab0ef8176ce8f7a56a..86516c645ada3a331c50488163f67e85aa8b89cc 100644 (file)
--- a/bacula/src/qt-console/status/storstat.h
+++ b/bacula/src/qt-console/status/storstat.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/storage/content.cpp b/bacula/src/qt-console/storage/content.cpp
index fe3acf7f90a65e5df230cb3704e18e743402530f..f8e937dcfcfe22578432a24ff26c04af6c37188f 100644 (file)
--- a/bacula/src/qt-console/storage/content.cpp
+++ b/bacula/src/qt-console/storage/content.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -274,13 +273,13 @@ void Content::populateContent()
    /* Get count of rows needed (Drives) */
    QStringList drives = results_all.filter(QRegExp("^D\\|[0-9]+\\|"));
    /* Ensure we have sufficient rows for Drive display */
-   tableDrive->setRowCount(drives.size());
+   tableDrive->setRowCount(drives.size()); 
    row = 0;
    foreach (resultline, drives) {
       fieldlist = resultline.split("|");
-      if (fieldlist.size() < 4) {
+      if (fieldlist.size() < 4) { 
          continue; /* some fields missing, ignore row */
-      }
+      } 
       int index=0;
       QStringListIterator fld(fieldlist);
       TableItemFormatter slotitem(*tableDrive, row);

diff --git a/bacula/src/qt-console/storage/content.h b/bacula/src/qt-console/storage/content.h
index 854cb55794ff9c8c956b8ad8b9f43583ec4afe0f..7877095e27ab6ec35c7543df690ef54792b78dac 100644 (file)
--- a/bacula/src/qt-console/storage/content.h
+++ b/bacula/src/qt-console/storage/content.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 9f5dc226cbca9009c186b9c08913220dde69bfdc..a21f995f8b6b241c3bc970de2f22b1a61f9b7726 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/storage/storage.h b/bacula/src/qt-console/storage/storage.h
index 7ff77e66d8e5c80ec261a0c89c71bb8991656d64..a747f2aed4c0bc72e69b1a646bd82b256ebdda77 100644 (file)
--- a/bacula/src/qt-console/storage/storage.h
+++ b/bacula/src/qt-console/storage/storage.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/tray-monitor/authenticate.cpp b/bacula/src/qt-console/tray-monitor/authenticate.cpp
index dde4682838500d2ecf99cb61f3c5fa2f6e4a577b..f78861a4b334192d52e97961cf4921beebe9c238 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/authenticate.cpp
+++ b/bacula/src/qt-console/tray-monitor/authenticate.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2013 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/tray-monitor/tray-monitor.cpp b/bacula/src/qt-console/tray-monitor/tray-monitor.cpp
index 590a1c00d8df6c7e4165916136613abf36e59926..d63314bf4bea22594d6fb37eca6b6a976016efb1 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.cpp
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2013 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/tray-monitor/tray-monitor.h b/bacula/src/qt-console/tray-monitor/tray-monitor.h
index 0e03420a901f965f51569a0e2af7fee1f47de5e3..762c81892879977de61c45914eb7144423c99280 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.h
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/tray-monitor/tray-ui.h b/bacula/src/qt-console/tray-monitor/tray-ui.h
index ce2b22f0928a68e309a1016207c3a4f99dd5b345..515bf0f460cd3ac142de92a6c2c6fb67dffd196f 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray-ui.h
+++ b/bacula/src/qt-console/tray-monitor/tray-ui.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/tray-monitor/tray_conf.cpp b/bacula/src/qt-console/tray-monitor/tray_conf.cpp
index ed6643f54ebe656c9d951bb1c21baab8200e7230..a1e35ce7ffe50bc66ae39bd4834db48dee5c807a 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray_conf.cpp
+++ b/bacula/src/qt-console/tray-monitor/tray_conf.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/tray-monitor/tray_conf.h b/bacula/src/qt-console/tray-monitor/tray_conf.h
index 38320a0c68598cf2fd1e2408bdd166189b653ca0..1bfd554337a3e197abc9431da7e2d1ace6811b48 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray_conf.h
+++ b/bacula/src/qt-console/tray-monitor/tray_conf.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/util/comboutil.cpp b/bacula/src/qt-console/util/comboutil.cpp
index cd78b93abc968c4d196086c0aaa71992dff9fbe7..d388a2831e88fafea9c2eaecbfb01cc37d7a5a62 100644 (file)
--- a/bacula/src/qt-console/util/comboutil.cpp
+++ b/bacula/src/qt-console/util/comboutil.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/util/comboutil.h b/bacula/src/qt-console/util/comboutil.h
index 8933b4fea7ad70f1d10af514bfc719e96ac17b88..e782315543347c8837691a9e648f6a9a9cf8176e 100644 (file)
--- a/bacula/src/qt-console/util/comboutil.h
+++ b/bacula/src/qt-console/util/comboutil.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/qt-console/util/fmtwidgetitem.cpp b/bacula/src/qt-console/util/fmtwidgetitem.cpp
index aebd1113db49207ce2a26d69d0e8c14bce57c0cc..1fbc4d37757a1f0870ffcbb73693e572795016f5 100644 (file)
--- a/bacula/src/qt-console/util/fmtwidgetitem.cpp
+++ b/bacula/src/qt-console/util/fmtwidgetitem.cpp
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -120,9 +119,10 @@ QString convertBytesIEC(qint64 qfld)
       return QString("%1 B").arg(qfld); 
    }
 
-   /* having divided for a smaller unit, now we can safely convert to double and
-      use the extra room for decimals */
-   return QString("%1 %2iB").arg(qfld / 1024.0, 0, 'f', 2).arg(suffix);
+   /* After dividing into a smaller value, we can safely convert from
+    *  to a double double and use the extra room for decimals
+    */
+   return QString("%1 %2iB").arg(qfld / 1024.0, 0, 'f', 2).arg(suffix); 
 }
 
 /* String to human value based on k=1000 */
@@ -135,7 +135,7 @@ QString convertBytesSI(qint64 qfld)
    static const qint64 PB = (TB * KB);
    static const qint64 EB = (PB * KB);
 
-   /* note: division is integer, so to have some decimals we divide for a
+   /* Note: division is integer, so to have some decimals we divide for a
       smaller unit (e.g. GB for a TB number and so on) */
    char suffix;
    if (qfld >= EB) {

diff --git a/bacula/src/qt-console/util/fmtwidgetitem.h b/bacula/src/qt-console/util/fmtwidgetitem.h
index 6dd5e12694658f6094b69ac807582e80dc21733e..859977ddf1e89f488b4c64970fa7cfc7fd9b5554 100644 (file)
--- a/bacula/src/qt-console/util/fmtwidgetitem.h
+++ b/bacula/src/qt-console/util/fmtwidgetitem.h
@@ -3,8 +3,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/acquire.c b/bacula/src/stored/acquire.c
index 153843c960b80d784cd1739908270d8b3134f4cc..c1229d257c98e789ce37fa6c38c6b4dc295c4ba8 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/ansi_label.c b/bacula/src/stored/ansi_label.c
index 516c925e7ac70db8794465dd3087df16cf444f52..8bbc91726b9b591313d4b5931e0aa306d7adc8d6 100644 (file)
--- a/bacula/src/stored/ansi_label.c
+++ b/bacula/src/stored/ansi_label.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/append.c b/bacula/src/stored/append.c
index 973476a4ab3761846f612d7d236a80c51fa4a6fd..ad8d28ff8aef45d4575a4bd4141c7e42aff0ca2b 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/askdir.c b/bacula/src/stored/askdir.c
index b7e9ba4df4411af1cd1efb78e0fa244b3bf4a3d0..d60ae101a7ccd75563626762b039842c2e6d609f 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/authenticate.c b/bacula/src/stored/authenticate.c
index 7572cd731a6af577479c05283ddd426b1f770d86..a1dc2fa192a285d8d46a755cd7b2a4fbcc809abc 100644 (file)
--- a/bacula/src/stored/authenticate.c
+++ b/bacula/src/stored/authenticate.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/autochanger.c b/bacula/src/stored/autochanger.c
index 40600562816c2f5900a18c0c09c23d6ed1b52dd8..cac14b78316da460abf67746dca5e419caa6ab8e 100644 (file)
--- a/bacula/src/stored/autochanger.c
+++ b/bacula/src/stored/autochanger.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/bcopy.c b/bacula/src/stored/bcopy.c
index eaac36ef166a43aa9934dc67d3e66ebdf819ba1e..26bcde1a241492ad06ad9f15d940a6e3f6fe9bb6 100644 (file)
--- a/bacula/src/stored/bcopy.c
+++ b/bacula/src/stored/bcopy.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/bextract.c b/bacula/src/stored/bextract.c
index b0b16df9549a99556f56fc0eaa5c2d6d188996ea..717cecae8bfe4b5a34a3fa85b5016e7a0b4e4436 100644 (file)
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/block.c b/bacula/src/stored/block.c
index b74027bebc75dd77cfc7de20e358dd2aec8629a8..3bc9dae9e6959aa3af87f4259bca0926e816618f 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/block.h b/bacula/src/stored/block.h
index a8552b0defa4cd9deeb8b49c4ddf10b5a3953155..2217662205b29dd9bd77097ac5cac4445d2ec40c 100644 (file)
--- a/bacula/src/stored/block.h
+++ b/bacula/src/stored/block.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/block_util.c b/bacula/src/stored/block_util.c
index 11f3cf27ec00389fc8c17c15382630f8d6b7becb..cedcc8d33518b349d36fcf63a5a86a8027c5b990 100644 (file)
--- a/bacula/src/stored/block_util.c
+++ b/bacula/src/stored/block_util.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/bls.c b/bacula/src/stored/bls.c
index e677004dbdd02fa9f95d1922a51be9bed832dba6..ced369248a141696a8dc095e4827be3aaf02e7da 100644 (file)
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/bscan.c b/bacula/src/stored/bscan.c
index 4757fb0d641d4668c6276705a9958493be14b17c..ca3653a21b4f53184d7a103d47371e15f58ae65a 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/bsr.h b/bacula/src/stored/bsr.h
index 568bfe9c7ae0cf1ddad1a091ba6e0649045ab515..344f8e091449adb8750dce9452cb16c261cc1566 100644 (file)
--- a/bacula/src/stored/bsr.h
+++ b/bacula/src/stored/bsr.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/btape.c b/bacula/src/stored/btape.c
index f4fa3aa6ef55f314f227f6b4b5449325cced041f..581752015fad5616bdb5781dc20ab97bc103bbf5 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/butil.c b/bacula/src/stored/butil.c
index bc9d14a2383270aee04593af5300b18fc24e6af2..b380dc8fb48132b7dd2fe3bf29481da619d0c5c2 100644 (file)
--- a/bacula/src/stored/butil.c
+++ b/bacula/src/stored/butil.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/dev.c b/bacula/src/stored/dev.c
index 2ff57f807626f8de23edf1317b0b068e2f67791c..8d07f4f3b97c1aedf8d73d4509466ef6d8c1efcd 100644 (file)
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -249,7 +248,7 @@ DEVICE *m_init_dev(JCR *jcr, DEVRES *device)
    /* Keep the device ID in the DEVICE struct to identify the hardware */
    if (dev->is_file() && stat(dev->archive_name(), &statp) == 0) {
          dev->devno = statp.st_dev;
-   }
+   } 
 
    /* Sanity check */
    if (dev->max_block_size == 0) {
@@ -753,7 +752,7 @@ bool DEVICE::close()
                print_name(), be.bstrerror());
          ok = false;
       }
-      break;
+      break; 
    }
 
    unmount(1);                       /* do unmount if required */

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index ef24f3ef68b44a895c1502ac9ae2dd317a4918bc..1371e385b61c6247710fb314df67dcba20e3a11c 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/device.c b/bacula/src/stored/device.c
index e2b31f51bf25bfe4f713cb10af8a0c022abcfa46..be01f9a409dd1c8a23fccd41df1ea565c773c60d 100644 (file)
--- a/bacula/src/stored/device.c
+++ b/bacula/src/stored/device.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/dircmd.c b/bacula/src/stored/dircmd.c
index abf9f1a990751d22243ff3db3118ad4b71ad36cf..c7b03140846ef64d724411c77013014d4160e563 100644 (file)
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/ebcdic.c b/bacula/src/stored/ebcdic.c
index 1a4d2651c0887209b9c22c58a0a827fec9112e3e..eddcddc92b61aabd5fa3e77127192bf4456c2972 100644 (file)
--- a/bacula/src/stored/ebcdic.c
+++ b/bacula/src/stored/ebcdic.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/fd_cmds.c b/bacula/src/stored/fd_cmds.c
index d966250cf5a81103e2a8db61e82e46b72560f8f7..630f5e04762fb5aa6afb601064abda2bd0add013 100644 (file)
--- a/bacula/src/stored/fd_cmds.c
+++ b/bacula/src/stored/fd_cmds.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/file_dev.c b/bacula/src/stored/file_dev.c
index 09cee358f2cd6698617df4af69ce45cba425e483..9dfc22698d484af929a30841a83a2df2363a00b2 100644 (file)
--- a/bacula/src/stored/file_dev.c
+++ b/bacula/src/stored/file_dev.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/file_dev.h b/bacula/src/stored/file_dev.h
index 6dcbaee340f9419099076f8346bec47feff00b5c..6f765601a662e6b481c5a9b4f05ec6e8ff72c811 100644 (file)
--- a/bacula/src/stored/file_dev.h
+++ b/bacula/src/stored/file_dev.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/hello.c b/bacula/src/stored/hello.c
index f0f3f03c3a416fc52c8a89740100df19b0e0aae8..83e9d154e972963322972ba272536c6e661138e0 100644 (file)
--- a/bacula/src/stored/hello.c
+++ b/bacula/src/stored/hello.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/job.c b/bacula/src/stored/job.c
index 168c75b2bc25234ad804e0244c44d0dd9816af8d..721768544ca14b0f7a95385b2857c0256dbf7728 100644 (file)
--- a/bacula/src/stored/job.c
+++ b/bacula/src/stored/job.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/label.c b/bacula/src/stored/label.c
index 00112f3fa7cae103cdb595e949f279c796aaab7e..1c2e74afb93fd75665405a3112e651033749ab25 100644 (file)
--- a/bacula/src/stored/label.c
+++ b/bacula/src/stored/label.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/lock.c b/bacula/src/stored/lock.c
index 0fea98821be636a48b8f5975203f5590ec9b4f20..f5f6498f0b6cd24f3716d9b731d6eeb9df639e5c 100644 (file)
--- a/bacula/src/stored/lock.c
+++ b/bacula/src/stored/lock.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/lock.h b/bacula/src/stored/lock.h
index 2376ff730388786f15fd4638b0cff19ba468f115..e795d0ebfa4c9dbe6beb764a4b0236dc74bb0ee3 100644 (file)
--- a/bacula/src/stored/lock.h
+++ b/bacula/src/stored/lock.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/match_bsr.c b/bacula/src/stored/match_bsr.c
index 208a9a3a4f9c029890908cf04faf7e25cbf6b324..85cd565b0b10538edccbb640e860d5355731a96c 100644 (file)
--- a/bacula/src/stored/match_bsr.c
+++ b/bacula/src/stored/match_bsr.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/mount.c b/bacula/src/stored/mount.c
index a93e0e77da626c7ecf264e6524b3e0e00a3287dd..4b8101907cf38284131d17e1d60d20e3ef041b61 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2015 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/os.c b/bacula/src/stored/os.c
index 9f853b8bb41263d4d8c0b5707d97788e3d63a6f9..2f754eb25b6a1f6502eaace99114dca395094876 100644 (file)
--- a/bacula/src/stored/os.c
+++ b/bacula/src/stored/os.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/parse_bsr.c b/bacula/src/stored/parse_bsr.c
index 69f73c77752041d3560d6616471e1c59ba012821..049f41254a37eaa660fce21623deb0d6905f5504 100644 (file)
--- a/bacula/src/stored/parse_bsr.c
+++ b/bacula/src/stored/parse_bsr.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/protos.h b/bacula/src/stored/protos.h
index 3b7d36c576cc9fe3c919769442dc28d175053c01..adfdbcfed5f0ece7c158e105cb72df77ef30c3a3 100644 (file)
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/read.c b/bacula/src/stored/read.c
index 329cd599eb41a8310b30b93a5ef68b8e7cbd121e..a20db857f02ca0a3519a1684dcb1f096fff62d19 100644 (file)
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/read_records.c b/bacula/src/stored/read_records.c
index 3987cb00c2b9514edfd3eb1c202cead93d734c93..b42b1810b5c81c2f3d67f84f2441795a35aafa16 100644 (file)
--- a/bacula/src/stored/read_records.c
+++ b/bacula/src/stored/read_records.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/record.h b/bacula/src/stored/record.h
index 16fb0f60ce002ec8d8bcf32243e8a34baf043d09..36113d6f79f70a75b6c0e713b471438f5554075c 100644 (file)
--- a/bacula/src/stored/record.h
+++ b/bacula/src/stored/record.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/record_read.c b/bacula/src/stored/record_read.c
index 5e001cefb89b23ef2d3097c35bfa3928b00639c5..b69f79c2d02425df331878ad1cdeb766fa90362a 100644 (file)
--- a/bacula/src/stored/record_read.c
+++ b/bacula/src/stored/record_read.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/record_util.c b/bacula/src/stored/record_util.c
index e708193c40ef84e770a704c4c59773d782ae9fb1..7c3c54dad5d7db96441a1216b0029f893c635a8c 100644 (file)
--- a/bacula/src/stored/record_util.c
+++ b/bacula/src/stored/record_util.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/record_write.c b/bacula/src/stored/record_write.c
index 45799bcf604bddc3caa40608c0c50864eb8a36c9..bebe0740c6ac3dac2c2511a4d6a364d71b9614a6 100644 (file)
--- a/bacula/src/stored/record_write.c
+++ b/bacula/src/stored/record_write.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/reserve.c b/bacula/src/stored/reserve.c
index c5b3af436cbb362a6fc03dac214563420e427012..aca0cc4f94bd0ac7dba3bc07207227096b839d74 100644 (file)
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/reserve.h b/bacula/src/stored/reserve.h
index cb51f80c88f7d0c32f9d37b9f2a4e648b0214d55..4f3d7b305eff69fe8ec974192bcdd1fed9785620 100644 (file)
--- a/bacula/src/stored/reserve.h
+++ b/bacula/src/stored/reserve.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/scan.c b/bacula/src/stored/scan.c
index e4290b2722fb8bab5a1ea81b1bf4257bfd9dd78c..d5afc0e80bd1b45d3dc953ece8445917bb5af34c 100644 (file)
--- a/bacula/src/stored/scan.c
+++ b/bacula/src/stored/scan.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/sd_plugins.c b/bacula/src/stored/sd_plugins.c
index 58bedc50f7346dd91ab7b847fb16887e6d1a3b9a..b8550f255099979f957b3248ce4f3cc436702028 100644 (file)
--- a/bacula/src/stored/sd_plugins.c
+++ b/bacula/src/stored/sd_plugins.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -101,14 +100,14 @@ int generate_plugin_event(JCR *jcr, bsdEventType eventType, void *value)
 
    if (!b_plugin_list) {
       Dmsg0(dbglvl, "No b_plugin_list: generate_plugin_event ignored.\n");
-      return bRC_OK;
-   }
-   if (!jcr) {
-      Dmsg0(dbglvl, "No jcr: generate_plugin_event ignored.\n");
-      return bRC_OK;
-   }
-   if (!jcr->plugin_ctx_list) {
-       Dmsg0(dbglvl, "No plugin_ctx_list: generate_plugin_event ignored.\n");
+      return bRC_OK; 
+   } 
+   if (!jcr) { 
+      Dmsg0(dbglvl, "jcr==NULL: generate_plugin_event ignored.\n"); 
+      return bRC_OK; 
+   } 
+   if (!jcr->plugin_ctx_list) { 
+       Dmsg0(dbglvl, "No plugin_ctx_list: generate_plugin_event ignored.\n"); 
        return bRC_OK;                  /* Return if no plugins loaded */
    }
 
@@ -289,12 +288,9 @@ void new_plugins(JCR *jcr)
    if (jcr->is_job_canceled()) {
       return;
    }
-   /*
-    * If plugins already loaded, just return
-    */
-   if (jcr->plugin_ctx_list) {
-      return;
-   }
+
+   /* If plugins already loaded, just return */
+   if (jcr->plugin_ctx_list) return;
 
    int num = b_plugin_list->size();
 

diff --git a/bacula/src/stored/sd_plugins.h b/bacula/src/stored/sd_plugins.h
index 742f69903904399820f323d40624cbc7c8c6a1a3..1932f332260c785acc447886c13ce36264f98f1a 100644 (file)
--- a/bacula/src/stored/sd_plugins.h
+++ b/bacula/src/stored/sd_plugins.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/spool.c b/bacula/src/stored/spool.c
index 3e26fa76bfeaeddc14260d27a96e57a5e87b842d..db31745d4e7bac4ac1ac0ab972aaac325db05c41 100644 (file)
--- a/bacula/src/stored/spool.c
+++ b/bacula/src/stored/spool.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/status.c b/bacula/src/stored/status.c
index 2a8b7e6bf81627bab13884030c7edb346187300e..9a7c173f4be9c739868c166dad2f4565029040c9 100644 (file)
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/stored.c b/bacula/src/stored/stored.c
index abf0d4f8820280726f863f7824a2063c94dc8af5..a8d9dfc19dc09a709d032b4ce6117a2c8ac53b66 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/stored.h b/bacula/src/stored/stored.h
index dc4eb5e34acee5242b618d71148ba0abf09f2e39..bc03b25bf60acbffcf2ce7b1ebe8b16dab94748b 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index 3480d7328a12074ff9ae5476f02a4ade83845638..c903c39d6ed52a501ed14ed470dc37cfe3eecfbb 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/stored_conf.h b/bacula/src/stored/stored_conf.h
index a262f1f8d6c368126eeed824324e0df0e36cdd4d..9dee7ba687930089c778e75926f7c70d9ca547ba 100644 (file)
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/tape_dev.c b/bacula/src/stored/tape_dev.c
index 4afdd8b747c00b52f24da957a7e462e0de7ffd89..212819a3caadf8ff0bb91396b1d1911230023181 100644 (file)
--- a/bacula/src/stored/tape_dev.c
+++ b/bacula/src/stored/tape_dev.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/tape_dev.h b/bacula/src/stored/tape_dev.h
index c4dd9ce730b5927d52522301eb11713ad6478417..557e340d25036465d3205de2b60dbb216d302b55 100644 (file)
--- a/bacula/src/stored/tape_dev.h
+++ b/bacula/src/stored/tape_dev.h
@@ -1,8 +1,7 @@
 /*                                                              [vssfs.c] IQ
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/vbackup.c b/bacula/src/stored/vbackup.c
index b5715d3fd3f64bdb4ca2481674d4b2129ed39519..49e15c23649f79638d0c86d0ace5f8a236a1c2ea 100644 (file)
--- a/bacula/src/stored/vbackup.c
+++ b/bacula/src/stored/vbackup.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/vol_mgr.c b/bacula/src/stored/vol_mgr.c
index 0b7115473c95db6dcb28c12a837ee1d555a74f07..5d7bb1b66fe7a004f3e0c9d09aa1e735f23fafd0 100644 (file)
--- a/bacula/src/stored/vol_mgr.c
+++ b/bacula/src/stored/vol_mgr.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/vol_mgr.h b/bacula/src/stored/vol_mgr.h
index f492c11eb42514d091dae14865f633027299ffa2..59045c572131855989e14a857e05865142ca17e2 100644 (file)
--- a/bacula/src/stored/vol_mgr.h
+++ b/bacula/src/stored/vol_mgr.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/vtape_dev.c b/bacula/src/stored/vtape_dev.c
index 429d4bd361a0ba1dcfab91ee7d9f7607577d002f..1f9a03e00ddf3bcd23e54ac4aeb1e7c39c605686 100644 (file)
--- a/bacula/src/stored/vtape_dev.c
+++ b/bacula/src/stored/vtape_dev.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/vtape_dev.h b/bacula/src/stored/vtape_dev.h
index a53738d2266accd79269e5361a66d13cabf58330..347e182424af6d5e13bf8548b889e795a69c33c0 100644 (file)
--- a/bacula/src/stored/vtape_dev.h
+++ b/bacula/src/stored/vtape_dev.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/stored/wait.c b/bacula/src/stored/wait.c
index 018ed139a0536ffb57ab7e11556e2d40cf9b4a72..e664ee5023483b3b1898213e6c29babd006a1d3d 100644 (file)
--- a/bacula/src/stored/wait.c
+++ b/bacula/src/stored/wait.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    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/version.h b/bacula/src/version.h
index d7b6752c7a27104c41bfacb1a39154c44248df46..60df9e027a90930ea5a92624920f98b9255b8f1b 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -5,7 +5,7 @@
 #define COMMUNITY 1      /* Define to create a Windows community binary */
 
 /* Note: there can be only *one* VERSION in this file */
-#define VERSION "7.2.1"
+#define VERSION "7.4.0"
 #define BDATE   "10 January 2016"
 #define LSMDATE "10Jan16"
 
@@ -24,7 +24,6 @@
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2016 Kern Sibbald
-   Copyright (C) 2000-2015 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.