medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[fbreader] Fixed apparent bug in ZLStringUtil::replaceAll

Browse source 
Caught by gcc:

ZLStringUtil.cpp:132:38: warning: comparison of constant '4294967295' with boolean
expression is always true [-Wbool-compare]
   while ((pos == str.find(find, pos)) != std::string::npos) {
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~
This commit is contained in:
Slava Monich 2019-12-10 03:17:15 +03:00
parent 8c7988c0cd
commit 022056efee
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fbreader/fbreader/zlibrary/core/src/util/ZLStringUtil.cpp
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com> * Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com>
* Copyright (C) 2015 Slava Monich <slava.monich@jolla.com> * Copyright (C) 2015-2019 Slava Monich <slava.monich@jolla.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -129,7 +129,7 @@ std::vector<std::string> ZLStringUtil::splitString(const char *str, const char*
void ZLStringUtil::replaceAll(std::string &str, const std::string &find, const std::string &replaceWith) { void ZLStringUtil::replaceAll(std::string &str, const std::string &find, const std::string &replaceWith) {
size_t pos = 0; size_t pos = 0;
while ((pos == str.find(find, pos)) != std::string::npos) { while ((pos = str.find(find, pos)) != std::string::npos) {
str.replace(pos, find.length(), replaceWith); str.replace(pos, find.length(), replaceWith);
pos += replaceWith.length(); pos += replaceWith.length();
} }