diff --git a/src/common/conf_post.h b/src/common/conf_post.h index 43fa5c54..e5315418 100644 --- a/src/common/conf_post.h +++ b/src/common/conf_post.h @@ -25,7 +25,7 @@ typedef int mode_t; #endif // GMinw only typedef int pid_t; -inline int readlink(const char *cp, void *buf, int cnt) +inline int readlink(const char *, void *, int) { return -1; } diff --git a/src/common/textsplit.cpp b/src/common/textsplit.cpp index d8ce798d..d67f6301 100644 --- a/src/common/textsplit.cpp +++ b/src/common/textsplit.cpp @@ -577,8 +577,9 @@ bool TextSplit::text_to_words(const string &in) int nonalnumcnt = 0; Utf8Iter it(in); +#ifdef KATAKANA_AS_WORDS int prev_csc = -1; - +#endif for (; !it.eof(); it++) { unsigned int c = *it; nonalnumcnt++; @@ -627,9 +628,9 @@ bool TextSplit::text_to_words(const string &in) return false; } } + prev_csc = csc; #endif - prev_csc = csc; char asciirep = 0; int cc = whatcc(c, &asciirep); diff --git a/src/rcldb/rclabsfromtext.cpp b/src/rcldb/rclabsfromtext.cpp index e3fbe332..77e7d914 100644 --- a/src/rcldb/rclabsfromtext.cpp +++ b/src/rcldb/rclabsfromtext.cpp @@ -344,8 +344,6 @@ int Query::Native::abstractFromText( Chrono& ) { - Xapian::Database& xrdb(ndb->xrdb); - string rawtext; if (!ndb->getRawText(docid, rawtext)) { LOGDEB0("abstractFromText: can't fetch text\n"); diff --git a/src/rcldb/rclabstract.cpp b/src/rcldb/rclabstract.cpp index 8813d13f..eec666c5 100644 --- a/src/rcldb/rclabstract.cpp +++ b/src/rcldb/rclabstract.cpp @@ -636,7 +636,6 @@ int Query::Native::makeAbstract(Xapian::docid docid, } Rcl::Db::Native *ndb(m_q->m_db->m_ndb); - Xapian::Database& xrdb(ndb->xrdb); // Total number of slots we populate. The 7 is taken as // average word size. It was a mistake to have the user max diff --git a/src/rcldb/rclterms.cpp b/src/rcldb/rclterms.cpp index 711305d0..d8aeb92a 100644 --- a/src/rcldb/rclterms.cpp +++ b/src/rcldb/rclterms.cpp @@ -374,7 +374,7 @@ bool Db::Native::idxTermMatch_p( Xapian::TermIterator it = xdb.allterms_begin(); if (!is.empty()) it.skip_to(is.c_str()); - for (int rcnt = 0; it != xdb.allterms_end(); it++) { + for (; it != xdb.allterms_end(); it++) { const string ixterm{*it}; // If we're beyond the terms matching the initial // section, end