Small fixes for compiler warnings and log output

- explicitly declare functions override - removed unneeded variables - switched from Jmsg0 to Jmsg that does not print the sourcecode location
bareos · Dec 12, 2018 · 703ffae · 703ffae
1 parent bcbf382
commit 703ffae
Show file tree

Hide file tree

Showing 13 changed files with 136 additions and 138 deletions.
diff --git a/core/src/cats/bdb_postgresql.h b/core/src/cats/bdb_postgresql.h
@@ -37,29 +37,29 @@ class BareosDbPostgresql: public BareosDbPrivateInterface {
    /*
     * Methods.
     */
-   bool OpenDatabase(JobControlRecord *jcr);
-   void CloseDatabase(JobControlRecord *jcr);
-   bool ValidateConnection(void);
-   void EscapeString(JobControlRecord *jcr, char *snew, char *old, int len);
-   char *EscapeObject(JobControlRecord *jcr, char *old, int len);
-   void UnescapeObject(JobControlRecord *jcr, char *from, int32_t expected_len, POOLMEM *&dest, int32_t *len);
-   void StartTransaction(JobControlRecord *jcr);
-   void EndTransaction(JobControlRecord *jcr);
-   bool BigSqlQuery(const char *query, DB_RESULT_HANDLER *ResultHandler, void *ctx);
-   bool SqlQueryWithHandler(const char *query, DB_RESULT_HANDLER *ResultHandler, void *ctx);
-   bool SqlQueryWithoutHandler(const char *query, int flags = 0);
-   void SqlFreeResult(void);
-   SQL_ROW SqlFetchRow(void);
-   const char *sql_strerror(void);
-   void SqlDataSeek(int row);
-   int SqlAffectedRows(void);
-   uint64_t SqlInsertAutokeyRecord(const char *query, const char *table_name);
+   bool OpenDatabase(JobControlRecord *jcr) override;
+   void CloseDatabase(JobControlRecord *jcr) override;
+   bool ValidateConnection(void) override;
+   void EscapeString(JobControlRecord *jcr, char *snew, char *old, int len) override;
+   char *EscapeObject(JobControlRecord *jcr, char *old, int len) override;
+   void UnescapeObject(JobControlRecord *jcr, char *from, int32_t expected_len, POOLMEM *&dest, int32_t *len) override;
+   void StartTransaction(JobControlRecord *jcr) override;
+   void EndTransaction(JobControlRecord *jcr) override;
+   bool BigSqlQuery(const char *query, DB_RESULT_HANDLER *ResultHandler, void *ctx) override;
+   bool SqlQueryWithHandler(const char *query, DB_RESULT_HANDLER *ResultHandler, void *ctx) override;
+   bool SqlQueryWithoutHandler(const char *query, int flags = 0) override;
+   void SqlFreeResult(void) override;
+   SQL_ROW SqlFetchRow(void) override;
+   const char *sql_strerror(void) override;
+   void SqlDataSeek(int row) override;
+   int SqlAffectedRows(void) override;
+   uint64_t SqlInsertAutokeyRecord(const char *query, const char *table_name) override;
    SQL_FIELD *SqlFetchField(void);
-   bool SqlFieldIsNotNull(int field_type);
-   bool SqlFieldIsNumeric(int field_type);
-   bool SqlBatchStart(JobControlRecord *jcr);
-   bool SqlBatchEnd(JobControlRecord *jcr, const char *error);
-   bool SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecord *ar);
+   bool SqlFieldIsNotNull(int field_type) override;
+   bool SqlFieldIsNumeric(int field_type) override;
+   bool SqlBatchStart(JobControlRecord *jcr) override;
+   bool SqlBatchEnd(JobControlRecord *jcr, const char *error) override;
+   bool SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecord *ar) override;
 
    bool CheckDatabaseEncoding(JobControlRecord *jcr);
 

diff --git a/core/src/cats/bdb_priv.h b/core/src/cats/bdb_priv.h
@@ -48,23 +48,23 @@ class BareosDbPrivateInterface: public BareosDb {
    /*
     * Methods
     */
-   int SqlNumRows(void) { return num_rows_; }
-   void SqlFieldSeek(int field) { field_number_ = field; }
-   int SqlNumFields(void) { return num_fields_; }
-   virtual void SqlFreeResult(void) = 0;
-   virtual SQL_ROW SqlFetchRow(void) = 0;
-   virtual bool SqlQueryWithHandler(const char *query, DB_RESULT_HANDLER *ResultHandler, void *ctx) = 0;
-   virtual bool SqlQueryWithoutHandler(const char *query, int flags = 0) = 0;
-   virtual const char *sql_strerror(void) = 0;
-   virtual void SqlDataSeek(int row) = 0;
-   virtual int SqlAffectedRows(void) = 0;
-   virtual uint64_t SqlInsertAutokeyRecord(const char *query, const char *table_name) = 0;
-   virtual SQL_FIELD *SqlFetchField(void) = 0;
-   virtual bool SqlFieldIsNotNull(int field_type) = 0;
-   virtual bool SqlFieldIsNumeric(int field_type) = 0;
-   virtual bool SqlBatchStart(JobControlRecord *jcr) = 0;
-   virtual bool SqlBatchEnd(JobControlRecord *jcr, const char *error) = 0;
-   virtual bool SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecord *ar) = 0;
+   int SqlNumRows(void) override { return num_rows_; }
+   void SqlFieldSeek(int field) override { field_number_ = field; }
+   int SqlNumFields(void) override { return num_fields_; }
+   virtual void SqlFreeResult(void) override = 0;
+   virtual SQL_ROW SqlFetchRow(void) override = 0;
+   virtual bool SqlQueryWithHandler(const char *query, DB_RESULT_HANDLER *ResultHandler, void *ctx) override = 0;
+   virtual bool SqlQueryWithoutHandler(const char *query, int flags = 0) override = 0;
+   virtual const char *sql_strerror(void) override = 0;
+   virtual void SqlDataSeek(int row) override = 0;
+   virtual int SqlAffectedRows(void) override = 0;
+   virtual uint64_t SqlInsertAutokeyRecord(const char *query, const char *table_name) override = 0;
+   virtual SQL_FIELD *SqlFetchField(void) override = 0;
+   virtual bool SqlFieldIsNotNull(int field_type) override = 0;
+   virtual bool SqlFieldIsNumeric(int field_type) override = 0;
+   virtual bool SqlBatchStart(JobControlRecord *jcr) override = 0;
+   virtual bool SqlBatchEnd(JobControlRecord *jcr, const char *error) override = 0;
+   virtual bool SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecord *ar) override = 0;
 
 public:
    /*

diff --git a/core/src/dird/dird.cc b/core/src/dird/dird.cc
@@ -689,7 +689,6 @@ static bool CheckResources()
 {
    bool OK = true;
    JobResource *job;
-   bool need_tls;
    const std::string &configfile = my_config->get_base_config_path();
 
    LockRes(my_config);

diff --git a/core/src/dird/ndmp_fhdb_lmdb.cc b/core/src/dird/ndmp_fhdb_lmdb.cc
@@ -674,11 +674,11 @@ void NdmpFhdbLmdbProcessDb(struct ndmlog *ixlog)
       return;
    }
 
-   Jmsg0(nis->jcr, M_INFO, 0,  "Now processing lmdb database\n");
+   Jmsg(nis->jcr, M_INFO, 0,  "Now processing lmdb database\n");
 
    ProcessLmdb(nis, fhdb_state);
 
-   Jmsg0(nis->jcr, M_INFO, 0,  "Processing lmdb database done\n");
+   Jmsg(nis->jcr, M_INFO, 0,  "Processing lmdb database done\n");
 }
 
 } /* namespace directordaemon */

diff --git a/core/src/filed/accurate.h b/core/src/filed/accurate.h
@@ -135,7 +135,7 @@ class BareosAccurateFilelistHtable: public BareosAccurateFilelist {
       destroy();
    }
 
-   bool init() {
+   bool init() override {
       return true;
    }
 
@@ -145,12 +145,12 @@ class BareosAccurateFilelistHtable: public BareosAccurateFilelist {
                  int lstat_length,
                  char *chksum,
                  int checksum_length,
-                 int32_t delta_seq);
-   bool EndLoad();
-   accurate_payload *lookup_payload(char *fname);
-   bool UpdatePayload(char *fname, accurate_payload *payload);
-   bool SendBaseFileList();
-   bool SendDeletedList();
+                 int32_t delta_seq) override;
+   bool EndLoad() override;
+   accurate_payload *lookup_payload(char *fname) override;
+   bool UpdatePayload(char *fname, accurate_payload *payload) override;
+   bool SendBaseFileList() override;
+   bool SendDeletedList() override;
 };
 
 #ifdef HAVE_LMDB
@@ -179,19 +179,19 @@ class BareosAccurateFilelistLmdb: public BareosAccurateFilelist {
    ~BareosAccurateFilelistLmdb() {
       destroy();
    }
-   bool init();
+   bool init() override;
    bool AddFile(char *fname,
                  int fname_length,
                  char *lstat,
                  int lstat_length,
                  char *chksum,
                  int checksum_length,
-                 int32_t delta_seq);
-   bool EndLoad();
-   accurate_payload *lookup_payload(char *fname);
-   bool UpdatePayload(char *fname, accurate_payload *payload);
-   bool SendBaseFileList();
-   bool SendDeletedList();
+                 int32_t delta_seq) override;
+   bool EndLoad() override;
+   accurate_payload *lookup_payload(char *fname) override;
+   bool UpdatePayload(char *fname, accurate_payload *payload) override;
+   bool SendBaseFileList() override;
+   bool SendDeletedList() override;
 };
 #endif /* HAVE_LMDB */
 

diff --git a/core/src/lib/bsock_tcp.h b/core/src/lib/bsock_tcp.h
@@ -42,9 +42,9 @@ class BareosSocketTCP : public BareosSocket {
 
    /* methods -- in bsock_tcp.c */
    void FinInit(JobControlRecord * jcr, int sockfd, const char *who, const char *host, int port,
-                 struct sockaddr *lclient_addr);
+                 struct sockaddr *lclient_addr) override;
    bool open(JobControlRecord *jcr, const char *name, const char *host, char *service,
-             int port, utime_t heart_beat, int *fatal);
+             int port, utime_t heart_beat, int *fatal) override;
    bool SetKeepalive(JobControlRecord *jcr, int sockfd, bool enable, int keepalive_start, int keepalive_interval);
    bool SendPacket(int32_t *hdr, int32_t pktsiz);
 
@@ -53,26 +53,26 @@ class BareosSocketTCP : public BareosSocket {
    ~BareosSocketTCP();
 
    /* methods -- in bsock_tcp.c */
-   BareosSocket *clone();
+   BareosSocket *clone() override;
    bool connect(JobControlRecord * jcr, int retry_interval, utime_t max_retry_time,
                 utime_t heart_beat, const char *name, const char *host,
-                char *service, int port, bool verbose);
-   int32_t recv();
-   bool send();
+                char *service, int port, bool verbose) override;
+   int32_t recv() override;
+   bool send() override;
    bool fsend(const char*, ...);
-   int32_t read_nbytes(char *ptr, int32_t nbytes);
-   int32_t write_nbytes(char *ptr, int32_t nbytes);
+   int32_t read_nbytes(char *ptr, int32_t nbytes) override;
+   int32_t write_nbytes(char *ptr, int32_t nbytes) override;
    bool signal(int signal);
-   void close();
-   void destroy();
-   int GetPeer(char *buf, socklen_t buflen);
-   bool SetBufferSize(uint32_t size, int rw);
-   int SetNonblocking();
-   int SetBlocking();
-   void RestoreBlocking(int flags);
+   void close() override;
+   void destroy() override;
+   int GetPeer(char *buf, socklen_t buflen) override;
+   bool SetBufferSize(uint32_t size, int rw) override;
+   int SetNonblocking() override;
+   int SetBlocking() override;
+   void RestoreBlocking(int flags) override;
    bool ConnectionReceivedTerminateSignal() override;
-   int WaitData(int sec, int usec = 0);
-   int WaitDataIntr(int sec, int usec = 0);
+   int WaitData(int sec, int usec = 0) override;
+   int WaitDataIntr(int sec, int usec = 0) override;
 };
 
 typedef std::unique_ptr<BareosSocket,std::function<void(BareosSocket*)>> BareosSocketUniquePtr;

diff --git a/core/src/qt-tray-monitor/monitoritemthread.h b/core/src/qt-tray-monitor/monitoritemthread.h
@@ -45,7 +45,7 @@ class MonitorItemThread : public QThread
    bool doConnectionTest();
 
 protected:
-   virtual void run();
+   virtual void run() override;
    void dotest();
 
 private:

diff --git a/core/src/stored/backends/generic_tape_device.h b/core/src/stored/backends/generic_tape_device.h
@@ -40,35 +40,35 @@ class generic_tape_device: public Device {
    /*
     * Interface from Device
     */
-   virtual void OpenDevice(DeviceControlRecord *dcr, int omode);
-   virtual char *StatusDev();
-   virtual bool eod(DeviceControlRecord *dcr);
-   virtual void SetAteof();
-   virtual void SetAteot();
-   virtual bool offline();
-   virtual bool weof(int num);
-   virtual bool fsf(int num);
-   virtual bool bsf(int num);
-   virtual bool fsr(int num);
-   virtual bool bsr(int num);
-   virtual bool LoadDev();
-   virtual void LockDoor();
-   virtual void UnlockDoor();
-   virtual void clrerror(int func);
-   virtual void SetOsDeviceParameters(DeviceControlRecord *dcr);
-   virtual int32_t GetOsTapeFile();
-   virtual bool rewind(DeviceControlRecord *dcr);
-   virtual bool UpdatePos(DeviceControlRecord *dcr);
-   virtual bool Reposition(DeviceControlRecord *dcr, uint32_t rfile, uint32_t rblock);
-   virtual bool MountBackend(DeviceControlRecord *dcr, int timeout);
-   virtual bool UnmountBackend(DeviceControlRecord *dcr, int timeout);
-   virtual int d_close(int);
-   virtual int d_open(const char *pathname, int flags, int mode);
-   virtual int d_ioctl(int fd, ioctl_req_t request, char *mt = NULL);
-   virtual boffset_t d_lseek(DeviceControlRecord *dcr, boffset_t offset, int whence);
-   virtual ssize_t d_read(int fd, void *buffer, size_t count);
-   virtual ssize_t d_write(int fd, const void *buffer, size_t count);
-   virtual bool d_truncate(DeviceControlRecord *dcr);
+   virtual void OpenDevice(DeviceControlRecord *dcr, int omode) override;
+   virtual char *StatusDev() override;
+   virtual bool eod(DeviceControlRecord *dcr) override;
+   virtual void SetAteof() override;
+   virtual void SetAteot() override;
+   virtual bool offline() override;
+   virtual bool weof(int num) override;
+   virtual bool fsf(int num) override;
+   virtual bool bsf(int num) override;
+   virtual bool fsr(int num) override;
+   virtual bool bsr(int num) override;
+   virtual bool LoadDev() override;
+   virtual void LockDoor() override;
+   virtual void UnlockDoor() override;
+   virtual void clrerror(int func) override;
+   virtual void SetOsDeviceParameters(DeviceControlRecord *dcr) override;
+   virtual int32_t GetOsTapeFile() override;
+   virtual bool rewind(DeviceControlRecord *dcr) override;
+   virtual bool UpdatePos(DeviceControlRecord *dcr) override;
+   virtual bool Reposition(DeviceControlRecord *dcr, uint32_t rfile, uint32_t rblock) override;
+   virtual bool MountBackend(DeviceControlRecord *dcr, int timeout) override;
+   virtual bool UnmountBackend(DeviceControlRecord *dcr, int timeout) override;
+   virtual int d_close(int) override;
+   virtual int d_open(const char *pathname, int flags, int mode) override;
+   virtual int d_ioctl(int fd, ioctl_req_t request, char *mt = NULL) override;
+   virtual boffset_t d_lseek(DeviceControlRecord *dcr, boffset_t offset, int whence) override;
+   virtual ssize_t d_read(int fd, void *buffer, size_t count) override;
+   virtual ssize_t d_write(int fd, const void *buffer, size_t count) override;
+   virtual bool d_truncate(DeviceControlRecord *dcr) override;
 };
 
 } /* namespace storagedaemon */

diff --git a/core/src/stored/backends/unix_fifo_device.h b/core/src/stored/backends/unix_fifo_device.h
@@ -38,17 +38,17 @@ class unix_fifo_device: public Device {
    /*
     * Interface from Device
     */
-   void OpenDevice(DeviceControlRecord *dcr, int omode);
-   bool eod(DeviceControlRecord *dcr);
-   bool MountBackend(DeviceControlRecord *dcr, int timeout);
-   bool UnmountBackend(DeviceControlRecord *dcr, int timeout);
-   int d_close(int);
-   int d_open(const char *pathname, int flags, int mode);
-   int d_ioctl(int fd, ioctl_req_t request, char *mt = NULL);
-   boffset_t d_lseek(DeviceControlRecord *dcr, boffset_t offset, int whence);
-   ssize_t d_read(int fd, void *buffer, size_t count);
-   ssize_t d_write(int fd, const void *buffer, size_t count);
-   bool d_truncate(DeviceControlRecord *dcr);
+   void OpenDevice(DeviceControlRecord *dcr, int omode) override;
+   bool eod(DeviceControlRecord *dcr) override;
+   bool MountBackend(DeviceControlRecord *dcr, int timeout) override;
+   bool UnmountBackend(DeviceControlRecord *dcr, int timeout) override;
+   int d_close(int) override;
+   int d_open(const char *pathname, int flags, int mode) override;
+   int d_ioctl(int fd, ioctl_req_t request, char *mt = NULL) override;
+   boffset_t d_lseek(DeviceControlRecord *dcr, boffset_t offset, int whence) override;
+   ssize_t d_read(int fd, void *buffer, size_t count) override;
+   ssize_t d_write(int fd, const void *buffer, size_t count) override;
+   bool d_truncate(DeviceControlRecord *dcr) override;
 };
 
 } /* namespace storagedaemon */

diff --git a/core/src/stored/backends/unix_file_device.h b/core/src/stored/backends/unix_file_device.h
@@ -38,15 +38,15 @@ class unix_file_device: public Device {
    /*
     * Interface from Device
     */
-   bool MountBackend(DeviceControlRecord *dcr, int timeout);
-   bool UnmountBackend(DeviceControlRecord *dcr, int timeout);
-   int d_close(int);
-   int d_open(const char *pathname, int flags, int mode);
-   int d_ioctl(int fd, ioctl_req_t request, char *mt = NULL);
-   boffset_t d_lseek(DeviceControlRecord *dcr, boffset_t offset, int whence);
-   ssize_t d_read(int fd, void *buffer, size_t count);
-   ssize_t d_write(int fd, const void *buffer, size_t count);
-   bool d_truncate(DeviceControlRecord *dcr);
+   bool MountBackend(DeviceControlRecord *dcr, int timeout) override;
+   bool UnmountBackend(DeviceControlRecord *dcr, int timeout) override;
+   int d_close(int) override;
+   int d_open(const char *pathname, int flags, int mode) override;
+   int d_ioctl(int fd, ioctl_req_t request, char *mt = NULL) override;
+   boffset_t d_lseek(DeviceControlRecord *dcr, boffset_t offset, int whence) override;
+   ssize_t d_read(int fd, void *buffer, size_t count) override;
+   ssize_t d_write(int fd, const void *buffer, size_t count) override;
+   bool d_truncate(DeviceControlRecord *dcr) override;
 };
 
 } /* namespace storagedaemon */

diff --git a/core/src/stored/backends/unix_tape_device.h b/core/src/stored/backends/unix_tape_device.h
@@ -35,7 +35,7 @@ class unix_tape_device: public generic_tape_device {
    unix_tape_device();
    ~unix_tape_device();
 
-   int d_ioctl(int fd, ioctl_req_t request, char *op);
+   int d_ioctl(int fd, ioctl_req_t request, char *op) override;
 };
 
 } /* namespace storagedaemon */