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
+1
View File
@@ -34,6 +34,7 @@ using namespace std;
bool checkRetryFailed(RclConfig *conf, bool record)
{
#ifdef _WIN32
PRETEND_USE(record);
// Under Windows we only retry if the recollindex program is newer
// than the index
struct PathStat st;
+2 -2
View File
@@ -65,13 +65,13 @@ EXEDocFetcher::EXEDocFetcher(const EXEDocFetcher::Internal& _m)
stringsToString(m->sfetch) << "\n");
}
bool EXEDocFetcher::fetch(RclConfig* cnf, const Rcl::Doc& idoc, RawDoc& out)
bool EXEDocFetcher::fetch(RclConfig*, const Rcl::Doc& idoc, RawDoc& out)
{
out.kind = RawDoc::RDK_DATADIRECT;
return m->docmd(m->sfetch, idoc, out.data);
}
bool EXEDocFetcher::makesig(RclConfig* cnf, const Rcl::Doc& idoc, string& sig)
bool EXEDocFetcher::makesig(RclConfig*, const Rcl::Doc& idoc, string& sig)
{
return m->docmd(m->smkid, idoc, sig);
}
+1 -1
View File
@@ -75,7 +75,7 @@ public:
virtual bool makesig(RclConfig* cnf, const Rcl::Doc& idoc,
std::string& sig) = 0;
enum Reason{FetchOk, FetchNotExist, FetchNoPerm, FetchOther};
virtual Reason testAccess(RclConfig* cnf, const Rcl::Doc& idoc) {
virtual Reason testAccess(RclConfig*, const Rcl::Doc&) {
return FetchOther;
}
virtual ~DocFetcher() {}
+5 -5
View File
@@ -26,10 +26,10 @@ void readIdxStatus(RclConfig *config, DbIxStatus &status)
ConfSimple cs(config->getIdxStatusFile().c_str(), 1);
status.phase = DbIxStatus::Phase(cs.getInt("phase", 0));
cs.get("fn", status.fn);
status.docsdone = cs.getInt("docsdone", 0);
status.filesdone = cs.getInt("filesdone", 0);
status.fileerrors = cs.getInt("fileerrors", 0);
status.dbtotdocs = cs.getInt("dbtotdocs", 0);
status.totfiles = cs.getInt("totfiles", 0);
status.docsdone = (int)cs.getInt("docsdone", 0);
status.filesdone = (int)cs.getInt("filesdone", 0);
status.fileerrors = (int)cs.getInt("fileerrors", 0);
status.dbtotdocs = (int)cs.getInt("dbtotdocs", 0);
status.totfiles = (int)cs.getInt("totfiles", 0);
status.hasmonitor = cs.getBool("hasmonitor", false);
}
+2
View File
@@ -48,6 +48,8 @@ using namespace std;
static string mimetypefromdata(RclConfig *cfg, const string &fn, bool usfc)
{
LOGDEB1("mimetypefromdata: fn [" << fn << "]\n");
PRETEND_USE(usfc);
PRETEND_USE(cfg);
// First try the internal identifying routine
string mime = idFile(fn.c_str());
+4 -2
View File
@@ -229,6 +229,7 @@ static void makeIndexerOrExit(RclConfig *config, bool inPlaceReset)
void rclIxIonice(const RclConfig *config)
{
PRETEND_USE(config);
#ifndef _WIN32
string clss, classdata;
if (!config->getConfParam("monioniceclass", clss) || clss.empty())
@@ -241,6 +242,7 @@ void rclIxIonice(const RclConfig *config)
static void setMyPriority(const RclConfig *config)
{
PRETEND_USE(config);
#ifndef _WIN32
int prio{19};
std::string sprio;
@@ -474,8 +476,7 @@ static const char usage [] =
" -c <configdir> : specify config directory, overriding $RECOLL_CONFDIR\n"
;
static void
Usage(FILE *where = stderr)
static void Usage()
{
FILE *fp = (op_flags & OPT_h) ? stdout : stderr;
fprintf(fp, "%s: Usage: %s", path_getsimple(thisprog).c_str(), usage);
@@ -487,6 +488,7 @@ static RclConfig *config;
static void lockorexit(Pidfile *pidfile, RclConfig *config)
{
PRETEND_USE(config);
pid_t pid;
if ((pid = pidfile->open()) != 0) {
if (pid > 0) {
+1 -1
View File
@@ -58,7 +58,7 @@ public:
/** Purge a list of files. No way to do this currently and dont want
* to do anything as this is mostly called by the monitor when *I* delete
* files inside the queue dir */
bool purgeFiles(std::list<std::string>& files) {return true;}
bool purgeFiles(std::list<std::string>&) {return true;}
/** Called when indexing data from the cache, and from internfile for
* search result preview */
+1 -1
View File
@@ -58,7 +58,7 @@ bool WQDocFetcher::fetch(RclConfig* cnf, const Rcl::Doc& idoc, RawDoc& out)
return true;
}
bool WQDocFetcher::makesig(RclConfig* cnf, const Rcl::Doc& idoc, string& sig)
bool WQDocFetcher::makesig(RclConfig*, const Rcl::Doc&, string& sig)
{
// Web queue sigs are empty
sig.clear();