From 513c2c6cf9c7991273cf3330404575aafae6d8a2 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 10 Jan 2016 11:55:27 +0100 Subject: [PATCH] Change copyright as per agreement with FSFE --- bacula/src/cats/bdb.h | 3 +- bacula/src/cats/bdb_mysql.h | 117 +++++++++--------- bacula/src/cats/bvfs.c | 2 +- bacula/src/cats/bvfs.h | 3 +- bacula/src/cats/cats.c | 2 +- bacula/src/cats/cats.h | 3 +- bacula/src/cats/cats_null.c | 2 +- bacula/src/cats/mysql.c | 2 +- bacula/src/cats/postgresql.c | 2 +- bacula/src/cats/protos.h | 3 +- bacula/src/cats/sql.c | 3 +- bacula/src/cats/sql_cmds.h | 3 +- bacula/src/cats/sql_create.c | 8 +- bacula/src/cats/sql_delete.c | 2 +- bacula/src/cats/sql_find.c | 2 +- bacula/src/cats/sql_get.c | 2 +- bacula/src/cats/sql_list.c | 2 +- bacula/src/cats/sql_update.c | 2 +- bacula/src/cats/sqlite.c | 2 +- bacula/src/qt-console/bat.h | 3 +- bacula/src/qt-console/bat_conf.cpp | 3 +- bacula/src/qt-console/bat_conf.h | 3 +- bacula/src/qt-console/bcomm/dircomm.cpp | 3 +- bacula/src/qt-console/bcomm/dircomm.h | 3 +- bacula/src/qt-console/bcomm/dircomm_auth.cpp | 3 +- bacula/src/qt-console/clients/clients.cpp | 3 +- bacula/src/qt-console/clients/clients.h | 3 +- bacula/src/qt-console/console/console.cpp | 3 +- bacula/src/qt-console/console/console.h | 3 +- bacula/src/qt-console/fileset/fileset.cpp | 3 +- bacula/src/qt-console/fileset/fileset.h | 3 +- bacula/src/qt-console/help/help.cpp | 3 +- bacula/src/qt-console/help/help.h | 3 +- bacula/src/qt-console/job/job.cpp | 3 +- bacula/src/qt-console/job/job.h | 3 +- bacula/src/qt-console/jobgraphs/jobplot.cpp | 3 +- bacula/src/qt-console/jobgraphs/jobplot.h | 3 +- bacula/src/qt-console/joblist/joblist.cpp | 3 +- bacula/src/qt-console/joblist/joblist.h | 3 +- bacula/src/qt-console/joblog/joblog.cpp | 3 +- bacula/src/qt-console/joblog/joblog.h | 3 +- bacula/src/qt-console/jobs/jobs.cpp | 3 +- bacula/src/qt-console/jobs/jobs.h | 3 +- bacula/src/qt-console/label/label.cpp | 3 +- bacula/src/qt-console/label/label.h | 3 +- bacula/src/qt-console/main.cpp | 3 +- bacula/src/qt-console/mainwin.cpp | 3 +- bacula/src/qt-console/mainwin.h | 3 +- bacula/src/qt-console/mediaedit/mediaedit.cpp | 3 +- bacula/src/qt-console/mediaedit/mediaedit.h | 3 +- bacula/src/qt-console/mediainfo/mediainfo.cpp | 3 +- bacula/src/qt-console/mediainfo/mediainfo.h | 3 +- bacula/src/qt-console/medialist/medialist.cpp | 3 +- bacula/src/qt-console/medialist/medialist.h | 3 +- bacula/src/qt-console/medialist/mediaview.cpp | 7 +- bacula/src/qt-console/medialist/mediaview.h | 3 +- bacula/src/qt-console/mount/mount.cpp | 3 +- bacula/src/qt-console/mount/mount.h | 3 +- bacula/src/qt-console/pages.cpp | 3 +- bacula/src/qt-console/pages.h | 3 +- bacula/src/qt-console/relabel/relabel.cpp | 3 +- bacula/src/qt-console/relabel/relabel.h | 3 +- bacula/src/qt-console/restore/brestore.cpp | 3 +- bacula/src/qt-console/restore/prerestore.cpp | 3 +- bacula/src/qt-console/restore/restore.cpp | 3 +- bacula/src/qt-console/restore/restore.h | 3 +- bacula/src/qt-console/restore/restoretree.cpp | 3 +- bacula/src/qt-console/restore/restoretree.h | 3 +- bacula/src/qt-console/run/estimate.cpp | 3 +- bacula/src/qt-console/run/prune.cpp | 3 +- bacula/src/qt-console/run/run.cpp | 3 +- bacula/src/qt-console/run/run.h | 3 +- bacula/src/qt-console/run/runcmd.cpp | 3 +- bacula/src/qt-console/select/select.cpp | 3 +- bacula/src/qt-console/select/select.h | 3 +- bacula/src/qt-console/select/textinput.cpp | 3 +- bacula/src/qt-console/select/textinput.h | 3 +- bacula/src/qt-console/status/clientstat.cpp | 3 +- bacula/src/qt-console/status/clientstat.h | 3 +- bacula/src/qt-console/status/dirstat.cpp | 3 +- bacula/src/qt-console/status/dirstat.h | 3 +- bacula/src/qt-console/status/storstat.cpp | 3 +- bacula/src/qt-console/status/storstat.h | 3 +- bacula/src/qt-console/storage/content.cpp | 9 +- bacula/src/qt-console/storage/content.h | 3 +- bacula/src/qt-console/storage/storage.cpp | 3 +- bacula/src/qt-console/storage/storage.h | 3 +- .../qt-console/tray-monitor/authenticate.cpp | 3 +- .../qt-console/tray-monitor/tray-monitor.cpp | 3 +- .../qt-console/tray-monitor/tray-monitor.h | 3 +- bacula/src/qt-console/tray-monitor/tray-ui.h | 3 +- .../src/qt-console/tray-monitor/tray_conf.cpp | 3 +- .../src/qt-console/tray-monitor/tray_conf.h | 3 +- bacula/src/qt-console/util/comboutil.cpp | 3 +- bacula/src/qt-console/util/comboutil.h | 3 +- bacula/src/qt-console/util/fmtwidgetitem.cpp | 12 +- bacula/src/qt-console/util/fmtwidgetitem.h | 3 +- bacula/src/stored/acquire.c | 3 +- bacula/src/stored/ansi_label.c | 3 +- bacula/src/stored/append.c | 3 +- bacula/src/stored/askdir.c | 3 +- bacula/src/stored/authenticate.c | 3 +- bacula/src/stored/autochanger.c | 3 +- bacula/src/stored/bcopy.c | 3 +- bacula/src/stored/bextract.c | 3 +- bacula/src/stored/block.c | 3 +- bacula/src/stored/block.h | 3 +- bacula/src/stored/block_util.c | 3 +- bacula/src/stored/bls.c | 3 +- bacula/src/stored/bscan.c | 3 +- bacula/src/stored/bsr.h | 3 +- bacula/src/stored/btape.c | 3 +- bacula/src/stored/butil.c | 3 +- bacula/src/stored/dev.c | 7 +- bacula/src/stored/dev.h | 3 +- bacula/src/stored/device.c | 3 +- bacula/src/stored/dircmd.c | 3 +- bacula/src/stored/ebcdic.c | 3 +- bacula/src/stored/fd_cmds.c | 3 +- bacula/src/stored/file_dev.c | 3 +- bacula/src/stored/file_dev.h | 3 +- bacula/src/stored/hello.c | 3 +- bacula/src/stored/job.c | 3 +- bacula/src/stored/label.c | 3 +- bacula/src/stored/lock.c | 3 +- bacula/src/stored/lock.h | 3 +- bacula/src/stored/match_bsr.c | 3 +- bacula/src/stored/mount.c | 3 +- bacula/src/stored/os.c | 3 +- bacula/src/stored/parse_bsr.c | 3 +- bacula/src/stored/protos.h | 3 +- bacula/src/stored/read.c | 3 +- bacula/src/stored/read_records.c | 3 +- bacula/src/stored/record.h | 3 +- bacula/src/stored/record_read.c | 3 +- bacula/src/stored/record_util.c | 3 +- bacula/src/stored/record_write.c | 3 +- bacula/src/stored/reserve.c | 3 +- bacula/src/stored/reserve.h | 3 +- bacula/src/stored/scan.c | 3 +- bacula/src/stored/sd_plugins.c | 28 ++--- bacula/src/stored/sd_plugins.h | 3 +- bacula/src/stored/spool.c | 3 +- bacula/src/stored/status.c | 3 +- bacula/src/stored/stored.c | 3 +- bacula/src/stored/stored.h | 3 +- bacula/src/stored/stored_conf.c | 3 +- bacula/src/stored/stored_conf.h | 3 +- bacula/src/stored/tape_dev.c | 3 +- bacula/src/stored/tape_dev.h | 3 +- bacula/src/stored/vbackup.c | 3 +- bacula/src/stored/vol_mgr.c | 3 +- bacula/src/stored/vol_mgr.h | 3 +- bacula/src/stored/vtape_dev.c | 3 +- bacula/src/stored/vtape_dev.h | 3 +- bacula/src/stored/wait.c | 3 +- bacula/src/version.h | 3 +- 157 files changed, 239 insertions(+), 388 deletions(-) diff --git a/bacula/src/cats/bdb.h b/bacula/src/cats/bdb.h index 87b260be03..ae4770ba92 100644 --- 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 d260a76a3e..ac0d167c71 100644 --- 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 ff236cb8b0..372149ef1a 100644 --- 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 7f792ace00..5eb8f0ae4b 100644 --- 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 5e19cd546c..3cfbaedad9 100644 --- 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 2908f152f5..e2d48f6ae2 100644 --- 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 f3da1c2e7e..f5c360ac94 100644 --- 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 3ac8af7b41..d722bf4d8e 100644 --- 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 f8fa4a92f8..51d1a13fed 100644 --- 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 61c9119c18..e6a9c220a8 100644 --- 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 4b1278d2aa..e241d09efd 100644 --- 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 1d8602b0eb..43ded93f50 100644 --- 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 9a84a49c33..047c65057c 100644 --- 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 97bff2b8c7..b52c379651 100644 --- 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 c9b2d5b060..8adba6c32b 100644 --- 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 4f60b7f442..cfdb4151e1 100644 --- 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 fbba97a1fb..309e0db6b5 100644 --- 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 f4da1e351f..205a6d3a72 100644 --- 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 bed7e627c0..7dcbafe7f0 100644 --- 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 214ac7d793..5280d189c1 100644 --- 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 429cf4d8f3..0f8dcc2c9b 100644 --- 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 143168c4bd..7fa7a19951 100644 --- 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 55910641fc..d9e22a0e73 100644 --- 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 5d6446116a..54ce58dc65 100644 --- 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 32ac44cff6..8c24ca31b7 100644 --- 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 b9c2ea804d..37f288a94f 100644 --- 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 cbb593ec30..4ecdc00260 100644 --- 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 eb8ef45669..a183b919ec 100644 --- 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 e5e6c3a27d..0468676dad 100644 --- 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 1a8a3f97fd..5287c9416e 100644 --- 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 90f33b0733..c6f431af07 100644 --- 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 3e99563e7f..2967ce1bed 100644 --- 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 3d11ef78bf..c6e0ff5d83 100644 --- 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 515ed4739e..67ad1b4cd2 100644 --- 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 44d328a0c7..7f14463f69 100644 --- 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 1b14e41b24..abb0b4608d 100644 --- 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 4297b4be4c..86a6048903 100644 --- 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 4afbb68fc5..4440722a12 100644 --- 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 1a154ba134..bc417626eb 100644 --- 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 11d8bb9844..46ae5546fd 100644 --- 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 27d6bbb3f9..255276e428 100644 --- 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 edb621788b..a6df56e861 100644 --- 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 425a398ac3..8622c95e11 100644 --- 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 fae53a770a..664d0e50c5 100644 --- 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 ff87637401..1fa7415256 100644 --- 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 9e8c723be1..162e2c5ed5 100644 --- 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 835f7156ba..27d477d9b1 100644 --- 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 3d96e76b70..a88c79deb2 100644 --- 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 783c6da246..9662e376ef 100644 --- 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 7aa986e45f..5856f30801 100644 --- 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 6184d4017c..e6cb853573 100644 --- 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 0e64d5dd75..af5d5b8124 100644 --- 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 e9adb2a52a..b8a255f1a5 100644 --- 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 7850540118..0c3f674352 100644 --- 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 5650a264a9..8636e8369f 100644 --- 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 items = m_tableMedia->selectedItems(); + QList 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 0b41717673..e2808c0519 100644 --- 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 475e486ba7..2d466e19e8 100644 --- 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 9706d2b049..4703c981f8 100644 --- 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 d21a76e5d4..05713da4ba 100644 --- 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 997207a589..4c5ef5dfec 100644 --- 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 aeace6c4f8..b416f7a33e 100644 --- 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 746ba3c8ab..105d627570 100644 --- 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 7503fb26c5..341a998488 100644 --- 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 482c8d1dfc..88c67fccd4 100644 --- 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 70cc2992e3..c8c0770f4c 100644 --- 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 8710635002..7ece0af400 100644 --- 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 0bc9172d3d..d32270cf58 100644 --- 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 ae39d3c340..74b9f2fe4e 100644 --- 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 9aa894e37a..8a31697f58 100644 --- 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 94e08c7e76..64955770ac 100644 --- 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 a86f526829..c8199e5ef9 100644 --- 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 59d037b03f..ad9329c524 100644 --- 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 6ce39cefbe..c7616b0af1 100644 --- 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 8d628de687..f026920ca1 100644 --- 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 a4377fc7bb..4589cc013a 100644 --- 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 691f646bea..a32e1ff242 100644 --- 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 83fb93e05f..5165de9c26 100644 --- 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 97393a9c5e..d11ae97775 100644 --- 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 f88dfa917f..eb44b38e9b 100644 --- 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 1747f4cb7b..e7db91d20d 100644 --- 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 c83c918583..f99634c3bd 100644 --- 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 86eff95916..5eb326eeaf 100644 --- 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 55bd74a259..86516c645a 100644 --- 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 fe3acf7f90..f8e937dcfc 100644 --- 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 854cb55794..7877095e27 100644 --- 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 9f5dc226cb..a21f995f8b 100644 --- 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 7ff77e66d8..a747f2aed4 100644 --- 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 dde4682838..f78861a4b3 100644 --- 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 590a1c00d8..d63314bf4b 100644 --- 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 0e03420a90..762c818928 100644 --- 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 ce2b22f092..515bf0f460 100644 --- 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 ed6643f54e..a1e35ce7ff 100644 --- 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 38320a0c68..1bfd554337 100644 --- 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 cd78b93abc..d388a2831e 100644 --- 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 8933b4fea7..e782315543 100644 --- 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 aebd1113db..1fbc4d3775 100644 --- 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 6dd5e12694..859977ddf1 100644 --- 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 153843c960..c1229d257c 100644 --- 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 516c925e7a..8bbc91726b 100644 --- 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 973476a4ab..ad8d28ff8a 100644 --- 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 b7e9ba4df4..d60ae101a7 100644 --- 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 7572cd731a..a1dc2fa192 100644 --- 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 4060056281..cac14b7831 100644 --- 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 eaac36ef16..26bcde1a24 100644 --- 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 b0b16df954..717cecae8b 100644 --- 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 b74027bebc..3bc9dae9e6 100644 --- 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 a8552b0def..2217662205 100644 --- 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 11f3cf27ec..cedcc8d335 100644 --- 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 e677004dbd..ced369248a 100644 --- 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 4757fb0d64..ca3653a21b 100644 --- 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 568bfe9c7a..344f8e0914 100644 --- 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 f4fa3aa6ef..581752015f 100644 --- 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 bc9d14a238..b380dc8fb4 100644 --- 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 2ff57f8076..8d07f4f3b9 100644 --- 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 ef24f3ef68..1371e385b6 100644 --- 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 e2b31f51bf..be01f9a409 100644 --- 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 abf9f1a990..c7b0314084 100644 --- 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 1a4d2651c0..eddcddc92b 100644 --- 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 d966250cf5..630f5e0476 100644 --- 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 09cee358f2..9dfc22698d 100644 --- 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 6dcbaee340..6f765601a6 100644 --- 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 f0f3f03c3a..83e9d154e9 100644 --- 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 168c75b2bc..721768544c 100644 --- 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 00112f3fa7..1c2e74afb9 100644 --- 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 0fea98821b..f5f6498f0b 100644 --- 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 2376ff7303..e795d0ebfa 100644 --- 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 208a9a3a4f..85cd565b0b 100644 --- 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 a93e0e77da..4b8101907c 100644 --- 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 9f853b8bb4..2f754eb25b 100644 --- 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 69f73c7775..049f41254a 100644 --- 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 3b7d36c576..adfdbcfed5 100644 --- 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 329cd599eb..a20db857f0 100644 --- 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 3987cb00c2..b42b1810b5 100644 --- 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 16fb0f60ce..36113d6f79 100644 --- 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 5e001cefb8..b69f79c2d0 100644 --- 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 e708193c40..7c3c54dad5 100644 --- 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 45799bcf60..bebe0740c6 100644 --- 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 c5b3af436c..aca0cc4f94 100644 --- 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 cb51f80c88..4f3d7b305e 100644 --- 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 e4290b2722..d5afc0e80b 100644 --- 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 58bedc50f7..b8550f2550 100644 --- 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 742f699039..1932f33226 100644 --- 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 3e26fa76bf..db31745d4e 100644 --- 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 2a8b7e6bf8..9a7c173f4b 100644 --- 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 abf0d4f882..a8d9dfc19d 100644 --- 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 dc4eb5e34a..bc03b25bf6 100644 --- 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 3480d7328a..c903c39d6e 100644 --- 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 a262f1f8d6..9dee7ba687 100644 --- 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 4afdd8b747..212819a3ca 100644 --- 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 c4dd9ce730..557e340d25 100644 --- 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 b5715d3fd3..49e15c2364 100644 --- 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 0b7115473c..5d7bb1b66f 100644 --- 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 f492c11eb4..59045c5721 100644 --- 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 429d4bd361..1f9a03e00d 100644 --- 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 a53738d226..347e182424 100644 --- 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 018ed139a0..e664ee5023 100644 --- 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 d7b6752c7a..60df9e027a 100644 --- 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. -- 2.39.5