smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+ remove a few warnings with better parentheses and a cast

This commit is contained in:
kelson42 2011-10-28 16:06:19 +00:00
parent 98bf706297
commit 400cf57343
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/kiwix/manager.cpp
View File

@ -205,7 +205,7 @@ namespace kiwix {
} }
if (!checkMetaData || if (!checkMetaData ||
checkMetaData && !book.title.empty() && !book.language.empty() && !book.date.empty()) { (checkMetaData && !book.title.empty() && !book.language.empty() && !book.date.empty())) {
book.url = url; book.url = url;
library.addBook(book); library.addBook(book);
return true; return true;
@ -367,7 +367,7 @@ namespace kiwix {
unsigned int result = 0; unsigned int result = 0;
std::vector<kiwix::Book>::iterator itr; std::vector<kiwix::Book>::iterator itr;
for ( itr = library.books.begin(); itr != library.books.end(); ++itr ) { for ( itr = library.books.begin(); itr != library.books.end(); ++itr ) {
if (!itr->path.empty() && localBooks || itr->path.empty() && remoteBooks) if ((!itr->path.empty() && localBooks) || (itr->path.empty() && remoteBooks))
result++; result++;
} }
return result; return result;
@ -407,7 +407,7 @@ namespace kiwix {
if (ok == true && mode == REMOTE && (!itr->path.empty() || itr->url.empty())) if (ok == true && mode == REMOTE && (!itr->path.empty() || itr->url.empty()))
ok = false; ok = false;
if (ok == true && atoi(itr->size.c_str()) > maxSize * 1024 * 1024) if (ok == true && (unsigned int)atoi(itr->size.c_str()) > maxSize * 1024 * 1024)
ok = false; ok = false;
if (ok == true && !language.empty() && itr->language != language) if (ok == true && !language.empty() && itr->language != language)
@ -416,7 +416,7 @@ namespace kiwix {
if (ok == true && !publisher.empty() && itr->creator != publisher) if (ok == true && !publisher.empty() && itr->creator != publisher)
ok = false; ok = false;
if (ok == true && !search.empty() && !(matchRegex(itr->title, search) || matchRegex(itr->description, search))) if ((ok == true && !search.empty()) && !(matchRegex(itr->title, search) || matchRegex(itr->description, search)))
ok = false; ok = false;
if (ok == true) { if (ok == true) {