Fixed MSVC warnings, all inocuous

This commit is contained in:
Jean-Francois Dockes
2020-04-17 14:26:40 +01:00
parent a51721b5c2
commit 39c152bada
49 changed files with 262 additions and 224 deletions
+4
View File
@@ -85,6 +85,10 @@ void reapXAttrs(const RclConfig* cfg, const string& path,
xfields[key] = value;
LOGDEB2("reapXAttrs: [" << key << "] -> [" << value << "]\n");
}
#else
PRETEND_USE(cfg);
PRETEND_USE(path);
PRETEND_USE(xfields);
#endif
}
+1 -1
View File
@@ -112,7 +112,7 @@ HtmlParser::HtmlParser()
}
void
HtmlParser::decode_entities(string &s)
HtmlParser::decode_entities(string &)
{
// Not used for recoll. Kept here to minimize the amount of
// diffs. Almost the same code in myhtmlparse except that the
+2 -2
View File
@@ -271,8 +271,8 @@ FileInterner::FileInterner(const string &data, RclConfig *cnf,
init(data, cnf, flags, imime);
}
void FileInterner::init(const string &data, RclConfig *cnf,
int flags, const string& imime)
void FileInterner::init(const string &data, RclConfig *,
int, const string& imime)
{
if (imime.empty()) {
LOGERR("FileInterner: inmemory constructor needs input mime type\n");
+1
View File
@@ -47,6 +47,7 @@ void MEAdv::reset()
void MEAdv::newData(int n)
{
PRETEND_USE(n);
LOGDEB2("MHExec:newData(" << n << ")\n");
if (m_filtermaxseconds > 0 &&
time(0L) - m_start > m_filtermaxseconds) {
+1 -1
View File
@@ -44,7 +44,7 @@ bool MimeHandlerHtml::set_document_file_impl(const string& mt, const string &fn)
return set_document_string(mt, otext);
}
bool MimeHandlerHtml::set_document_string_impl(const string& mt,
bool MimeHandlerHtml::set_document_string_impl(const string&,
const string& htext)
{
m_html = htext;
+2 -2
View File
@@ -85,7 +85,7 @@ void MimeHandlerMail::clear_impl()
m_attachments.clear();
}
bool MimeHandlerMail::set_document_file_impl(const string& mt, const string &fn)
bool MimeHandlerMail::set_document_file_impl(const string&, const string &fn)
{
LOGDEB("MimeHandlerMail::set_document_file(" << fn << ")\n");
if (m_fd >= 0) {
@@ -125,7 +125,7 @@ bool MimeHandlerMail::set_document_file_impl(const string& mt, const string &fn)
return true;
}
bool MimeHandlerMail::set_document_string_impl(const string& mt,
bool MimeHandlerMail::set_document_string_impl(const string&,
const string& msgtxt)
{
LOGDEB1("MimeHandlerMail::set_document_string\n");
+4 -2
View File
@@ -324,7 +324,9 @@ void MimeHandlerMbox::clear_impl()
m->fn.erase();
m->ipath.erase();
m->instream = ifstream();
m->msgnum = m->lineno = m->fsize = 0;
m->msgnum = 0;
m->lineno = 0;
m->fsize = 0;
m->offsets.clear();
m->quirks = 0;
}
@@ -334,7 +336,7 @@ bool MimeHandlerMbox::skip_to_document(const std::string& ipath) {
return true;
}
bool MimeHandlerMbox::set_document_file_impl(const string& mt, const string &fn)
bool MimeHandlerMbox::set_document_file_impl(const string&, const string &fn)
{
LOGDEB("MimeHandlerMbox::set_document_file(" << fn << ")\n");
clear_impl();
+1 -1
View File
@@ -39,7 +39,7 @@ class MimeHandlerNull : public RecollFilter {
}
virtual ~MimeHandlerNull() {}
virtual bool is_data_input_ok(DataInput input) const {
virtual bool is_data_input_ok(DataInput) const {
return true;
}
+1 -1
View File
@@ -60,7 +60,7 @@ class MimeHandlerSymlink : public RecollFilter {
return true;
}
protected:
virtual bool set_document_file_impl(const string& mt, const string& fn) {
virtual bool set_document_file_impl(const string&, const string& fn) {
m_fn = fn;
return m_havedoc = true;
}
+2 -2
View File
@@ -40,7 +40,7 @@ const int MB = 1024*1024;
const int KB = 1024;
// Process a plain text file
bool MimeHandlerText::set_document_file_impl(const string& mt, const string &fn)
bool MimeHandlerText::set_document_file_impl(const string&, const string &fn)
{
LOGDEB("MimeHandlerText::set_document_file: [" << fn << "] offs " <<
m_offs << "\n");
@@ -94,7 +94,7 @@ bool MimeHandlerText::set_document_file_impl(const string& mt, const string &fn)
return true;
}
bool MimeHandlerText::set_document_string_impl(const string& mt,
bool MimeHandlerText::set_document_string_impl(const string&,
const string& otext)
{
m_text = otext;
+1 -1
View File
@@ -32,7 +32,7 @@ class MimeHandlerUnknown : public RecollFilter {
: RecollFilter(cnf, id) {
}
virtual ~MimeHandlerUnknown() {}
virtual bool is_data_input_ok(DataInput input) const {
virtual bool is_data_input_ok(DataInput) const {
return true;
}
+3 -6
View File
@@ -71,8 +71,7 @@ public:
return ctxt->myDoc;
}
virtual bool init(int64_t size, string *) {
LOGDEB1("FileScanXML: init: size " << size << endl);
virtual bool init(int64_t, string *) {
ctxt = xmlCreatePushParserCtxt(NULL, NULL, NULL, 0, m_fn.c_str());
if (ctxt == nullptr) {
LOGERR("FileScanXML: xmlCreatePushParserCtxt failed\n");
@@ -276,8 +275,7 @@ bool MimeHandlerXslt::Internal::process_doc_or_string(
return true;
}
bool MimeHandlerXslt::set_document_file_impl(const std::string& mt,
const std::string &fn)
bool MimeHandlerXslt::set_document_file_impl(const string&, const string &fn)
{
LOGDEB0("MimeHandlerXslt::set_document_file_: fn: " << fn << endl);
if (!m || !m->ok) {
@@ -290,8 +288,7 @@ bool MimeHandlerXslt::set_document_file_impl(const std::string& mt,
return ret;
}
bool MimeHandlerXslt::set_document_string_impl(const string& mt,
const string& txt)
bool MimeHandlerXslt::set_document_string_impl(const string&, const string& txt)
{
LOGDEB0("MimeHandlerXslt::set_document_string_\n");
if (!m || !m->ok) {