tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed MSVC warnings, all inocuous

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/query/recollq.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ bool dump_contents(RclConfig *rclconfig, Rcl::Doc& idoc)
}
void output_fields(vector<string> fields, Rcl::Doc& doc,
Rcl::Query& query, Rcl::Db& rcldb, bool printnames)
Rcl::Query& query, Rcl::Db&, bool printnames)
{
if (fields.empty()) {
map<string,string>::const_iterator it;
src/query/wasaparse.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ int yylex(yy::parser::semantic_type *, yy::parser::location_type *,
void yyerror(char const *);
static void qualify(Rcl::SearchDataClauseDist *, const string &);
static void addSubQuery(WasaParserDriver *d,
static void addSubQuery(WasaParserDriver *,
Rcl::SearchData *sd, Rcl::SearchData *sq)
{
if (sd && sq)
src/query/wasaparse.ypp
+1 -1
View File
@@ -25,7 +25,7 @@ int yylex(yy::parser::semantic_type *, yy::parser::location_type *,
void yyerror(char const *);
static void qualify(Rcl::SearchDataClauseDist *, const string &);
static void addSubQuery(WasaParserDriver *d,
static void addSubQuery(WasaParserDriver *,
Rcl::SearchData *sd, Rcl::SearchData *sq)
{
if (sd && sq)
src/query/wasaparseaux.cpp
+6 -6
View File
@@ -33,7 +33,7 @@ using namespace Rcl;
void
yy::parser::error (const location_type& l, const std::string& m)
yy::parser::error (const location_type&, const std::string& m)
{
d->setreason(m);
}
@@ -55,7 +55,7 @@ WasaParserDriver::WasaParserDriver(const RclConfig *c, const std::string sl,
const std::string& as)
: m_stemlang(sl), m_autosuffs(as), m_config(c),
m_index(0), m_result(0), m_haveDates(false),
m_maxSize((size_t)-1), m_minSize((size_t)-1)
m_maxSize(-1), m_minSize(-1)
{
}
@@ -95,10 +95,10 @@ SearchData *WasaParserDriver::parse(const std::string& in)
if (m_haveDates) {
m_result->setDateSpan(&m_dates);
}
if (m_minSize != (size_t)-1) {
if (m_minSize != -1) {
m_result->setMinSize(m_minSize);
}
if (m_maxSize != (size_t)-1) {
if (m_maxSize != -1) {
m_result->setMaxSize(m_maxSize);
}
//if (m_result) m_result->dump(cout);
@@ -193,13 +193,13 @@ bool WasaParserDriver::addClause(SearchData *sd,
// Handle "size" spec
if (!fld.compare("size")) {
char *cp;
size_t size = strtoll(cl->gettext().c_str(), &cp, 10);
int64_t size = strtoll(cl->gettext().c_str(), &cp, 10);
if (*cp != 0) {
switch (*cp) {
case 'k': case 'K': size *= 1000;break;
case 'm': case 'M': size *= 1000*1000;break;
case 'g': case 'G': size *= 1000*1000*1000;break;
case 't': case 'T': size *= size_t(1000)*1000*1000*1000;break;
case 't': case 'T': size *= int64_t(1000)*1000*1000*1000;break;
default:
m_reason = string("Bad multiplier suffix: ") + *cp;
delete cl;
src/query/wasaparserdriver.h
+2 -2
View File
@@ -78,8 +78,8 @@ private:
std::vector<std::string> m_nfiletypes;
bool m_haveDates;
DateInterval m_dates; // Restrict to date interval
size_t m_maxSize;
size_t m_minSize;
int64_t m_maxSize;
int64_t m_minSize;
std::string m_reason;