From 33e1847b26f7a0417c3e83cd358dcb1b9f6d23a7 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sun, 28 Apr 2019 15:39:15 +0200 Subject: [PATCH] suppress misc warnings on fedora and macosx --- src/internfile/mh_exec.h | 6 +++--- src/internfile/mh_execm.h | 4 ++-- src/internfile/mh_html.h | 8 ++++---- src/internfile/mh_mail.h | 10 +++++----- src/internfile/mh_mbox.h | 6 +++--- src/internfile/mh_text.h | 10 +++++----- src/internfile/mh_xslt.h | 4 ++-- src/query/docseqhist.cpp | 3 +-- src/utils/conftree.h | 28 ++++++++++++++-------------- src/utils/pathut.h | 3 +++ src/utils/strmatcher.h | 12 ++++++------ 11 files changed, 48 insertions(+), 46 deletions(-) diff --git a/src/internfile/mh_exec.h b/src/internfile/mh_exec.h index dfe748d0..a372a630 100644 --- a/src/internfile/mh_exec.h +++ b/src/internfile/mh_exec.h @@ -70,8 +70,8 @@ class MimeHandlerExec : public RecollFilter { MimeHandlerExec(RclConfig *cnf, const std::string& id); - virtual bool next_document(); - virtual bool skip_to_document(const std::string& ipath); + virtual bool next_document() override; + virtual bool skip_to_document(const std::string& ipath) override; virtual void clear_impl() override { m_fn.erase(); @@ -80,7 +80,7 @@ class MimeHandlerExec : public RecollFilter { protected: virtual bool set_document_file_impl(const std::string& mt, - const std::string& file_path); + const std::string& file_path) override; std::string m_fn; std::string m_ipath; diff --git a/src/internfile/mh_execm.h b/src/internfile/mh_execm.h index b2babc2c..c3547c21 100644 --- a/src/internfile/mh_execm.h +++ b/src/internfile/mh_execm.h @@ -108,14 +108,14 @@ class MimeHandlerExecMultiple : public MimeHandlerExec { // No resources to clean up, the ExecCmd destructor does it. virtual ~MimeHandlerExecMultiple() {} - virtual bool next_document(); + virtual bool next_document() override; // skip_to and clear inherited from MimeHandlerExec protected: // This is the only 2nd-level derived handler class. Use call-super. virtual bool set_document_file_impl(const std::string& mt, - const std::string &file_path) { + const std::string &file_path) override { m_filefirst = true; return MimeHandlerExec::set_document_file_impl(mt, file_path); } diff --git a/src/internfile/mh_html.h b/src/internfile/mh_html.h index 85e56127..771c15a9 100644 --- a/src/internfile/mh_html.h +++ b/src/internfile/mh_html.h @@ -31,12 +31,12 @@ class MimeHandlerHtml : public RecollFilter { } virtual ~MimeHandlerHtml() {} - virtual bool is_data_input_ok(DataInput input) const { + virtual bool is_data_input_ok(DataInput input) const override { if (input == DOCUMENT_FILE_NAME || input == DOCUMENT_STRING) return true; return false; } - virtual bool next_document(); + virtual bool next_document() override; const std::string& get_html() { return m_html; } @@ -46,9 +46,9 @@ class MimeHandlerHtml : public RecollFilter { } protected: virtual bool set_document_file_impl(const std::string& mt, - const std::string &file_path); + const std::string &file_path) override; virtual bool set_document_string_impl(const std::string& mt, - const std::string &data); + const std::string &data) override; private: std::string m_filename; diff --git a/src/internfile/mh_mail.h b/src/internfile/mh_mail.h index 4db543b0..2147b37f 100644 --- a/src/internfile/mh_mail.h +++ b/src/internfile/mh_mail.h @@ -37,18 +37,18 @@ class MimeHandlerMail : public RecollFilter { public: MimeHandlerMail(RclConfig *cnf, const std::string &id); virtual ~MimeHandlerMail(); - virtual bool is_data_input_ok(DataInput input) const { + virtual bool is_data_input_ok(DataInput input) const override { return (input == DOCUMENT_FILE_NAME || input == DOCUMENT_STRING); } - virtual bool next_document(); - virtual bool skip_to_document(const std::string& ipath); + virtual bool next_document() override; + virtual bool skip_to_document(const std::string& ipath) override; virtual void clear_impl() override; protected: virtual bool set_document_file_impl(const std::string& mt, - const std::string& file_path); + const std::string& file_path) override; virtual bool set_document_string_impl(const std::string& mt, - const std::string& data); + const std::string& data) override; private: bool processMsg(Binc::MimePart *doc, int depth); diff --git a/src/internfile/mh_mbox.h b/src/internfile/mh_mbox.h index 107ecb4b..d6e8aa76 100644 --- a/src/internfile/mh_mbox.h +++ b/src/internfile/mh_mbox.h @@ -34,8 +34,8 @@ public: m_lineno(0), m_fsize(0) { } virtual ~MimeHandlerMbox(); - virtual bool next_document(); - virtual bool skip_to_document(const std::string& ipath) { + virtual bool next_document() override; + virtual bool skip_to_document(const std::string& ipath) override{ m_ipath = ipath; return true; } @@ -44,7 +44,7 @@ public: protected: virtual bool set_document_file_impl(const std::string&, - const std::string&); + const std::string&) override; private: std::string m_fn; // File name diff --git a/src/internfile/mh_text.h b/src/internfile/mh_text.h index f3259e93..8112857d 100644 --- a/src/internfile/mh_text.h +++ b/src/internfile/mh_text.h @@ -36,13 +36,13 @@ public: } virtual ~MimeHandlerText() {} - virtual bool is_data_input_ok(DataInput input) const { + virtual bool is_data_input_ok(DataInput input) const override { if (input == DOCUMENT_FILE_NAME || input == DOCUMENT_STRING) return true; return false; } - virtual bool next_document(); - virtual bool skip_to_document(const std::string& s); + virtual bool next_document() override; + virtual bool skip_to_document(const std::string& s) override; virtual void clear_impl() override { m_paging = false; m_text.clear(); @@ -54,9 +54,9 @@ public: protected: virtual bool set_document_file_impl(const std::string& mt, - const std::string &file_path); + const std::string &file_path) override; virtual bool set_document_string_impl(const std::string&, - const std::string&); + const std::string&) override; private: bool m_paging{false}; diff --git a/src/internfile/mh_xslt.h b/src/internfile/mh_xslt.h index ae90035e..16ad866b 100644 --- a/src/internfile/mh_xslt.h +++ b/src/internfile/mh_xslt.h @@ -36,9 +36,9 @@ class MimeHandlerXslt : public RecollFilter { protected: virtual bool set_document_file_impl(const std::string& mt, - const std::string& file_path); + const std::string& file_path) override; virtual bool set_document_string_impl(const std::string& mt, - const std::string& data); + const std::string& data) override; class Internal; private: diff --git a/src/query/docseqhist.cpp b/src/query/docseqhist.cpp index 0ac0c05d..e579c230 100644 --- a/src/query/docseqhist.cpp +++ b/src/query/docseqhist.cpp @@ -134,8 +134,7 @@ bool DocSequenceHistory::getDoc(int num, Rcl::Doc &doc, string *sh) RclDHistoryEntry& hentry = m_history[m_history.size() - 1 - num]; if (sh) { - if (m_prevtime < 0 || - abs (float(m_prevtime) - float(hentry.unixtime)) > 86400) { + if (m_prevtime < 0 || abs(m_prevtime - hentry.unixtime) > 86400) { m_prevtime = hentry.unixtime; time_t t = (time_t)(hentry.unixtime); *sh = string(ctime(&t)); diff --git a/src/utils/conftree.h b/src/utils/conftree.h index b259596c..601ae85e 100644 --- a/src/utils/conftree.h +++ b/src/utils/conftree.h @@ -202,7 +202,7 @@ public: virtual int clear(); virtual StatusCode getStatus() const; - virtual bool ok() const { + virtual bool ok() const override { return getStatus() != STATUS_ERROR; } @@ -223,12 +223,12 @@ public: virtual void showall() const override; /** Return all names in given submap. */ - virtual std::vector getNames(const std::string& sk, - const char *pattern = 0) const; + virtual std::vector getNames( + const std::string& sk, const char *pattern = 0) const override; /** Check if name is present in any submap. This is relatively expensive * but useful for saving further processing sometimes */ - virtual bool hasNameAnywhere(const std::string& nm) const; + virtual bool hasNameAnywhere(const std::string& nm) const override; /** * Return all subkeys @@ -446,7 +446,7 @@ public: return get(name, value, sk, false); } - virtual bool hasNameAnywhere(const std::string& nm) const { + virtual bool hasNameAnywhere(const std::string& nm) const override { typename std::vector::const_iterator it; for (it = m_confs.begin(); it != m_confs.end(); it++) { if ((*it)->hasNameAnywhere(nm)) { @@ -457,7 +457,7 @@ public: } virtual int set(const std::string& nm, const std::string& val, - const std::string& sk = std::string()) { + const std::string& sk = std::string()) override { if (!m_ok) { return 0; } @@ -487,18 +487,18 @@ public: return m_confs.front()->set(nm, val, sk); } - virtual int erase(const std::string& nm, const std::string& sk) { + virtual int erase(const std::string& nm, const std::string& sk) override { return m_confs.front()->erase(nm, sk); } - virtual int eraseKey(const std::string& sk) { + virtual int eraseKey(const std::string& sk) override { return m_confs.front()->eraseKey(sk); } - virtual bool holdWrites(bool on) { + virtual bool holdWrites(bool on) override { return m_confs.front()->holdWrites(on); } - virtual std::vector getNames(const std::string& sk, - const char *pattern = 0) const { + virtual std::vector getNames( + const std::string& sk, const char *pattern = 0) const override { return getNames1(sk, pattern, false); } virtual std::vector getNamesShallow(const std::string& sk, @@ -527,10 +527,10 @@ public: return nms; } - virtual std::vector getSubKeys() const { + virtual std::vector getSubKeys() const override { return getSubKeys(false); } - virtual std::vector getSubKeys(bool shallow) const { + virtual std::vector getSubKeys(bool shallow) const override { std::vector sks; typename std::vector::const_iterator it; for (it = m_confs.begin(); it != m_confs.end(); it++) { @@ -547,7 +547,7 @@ public: return sks; } - virtual bool ok() const { + virtual bool ok() const override { return m_ok; } diff --git a/src/utils/pathut.h b/src/utils/pathut.h index 75f9de50..be2b47ba 100644 --- a/src/utils/pathut.h +++ b/src/utils/pathut.h @@ -150,6 +150,9 @@ public: /// Convert \ separators to / void path_slashize(std::string& s); void path_backslashize(std::string& s); +#include "safeunistd.h" +#else +#include #endif /// Lock/pid file class. This is quite close to the pidfile_xxx diff --git a/src/utils/strmatcher.h b/src/utils/strmatcher.h index 14a5d3a9..be177c6f 100644 --- a/src/utils/strmatcher.h +++ b/src/utils/strmatcher.h @@ -54,9 +54,9 @@ public: StrWildMatcher(const std::string& exp) : StrMatcher(exp) {} virtual ~StrWildMatcher() {} - virtual bool match(const std::string& val) const; - virtual std::string::size_type baseprefixlen() const; - virtual StrWildMatcher *clone() const { + virtual bool match(const std::string& val) const override; + virtual std::string::size_type baseprefixlen() const override; + virtual StrWildMatcher *clone() const override { return new StrWildMatcher(m_sexp); } }; @@ -66,10 +66,10 @@ public: StrRegexpMatcher(const std::string& exp); virtual bool setExp(const std::string& newexp) override; virtual ~StrRegexpMatcher() {}; - virtual bool match(const std::string& val) const; - virtual std::string::size_type baseprefixlen() const; + virtual bool match(const std::string& val) const override; + virtual std::string::size_type baseprefixlen() const override; virtual bool ok() const override; - virtual StrRegexpMatcher *clone() const { + virtual StrRegexpMatcher *clone() const override { return new StrRegexpMatcher(m_sexp); } private: