walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Clarify loop logic 

* clearer variable names
* don't rely on npos being outside indices range - explicitly break the loop instead
This commit is contained in:
Dmitry-Me 2016-08-23 18:27:07 +03:00
parent 9968b61db3
commit cd6aa27010
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/preprocessor.cpp
View File

@ -440,13 +440,15 @@ void Preprocessor::preprocess(std::istream &srcCodeStream, std::string &processe
static void splitcfg(const std::string &cfg, std::list<std::string> &defines, const std::string &defaultValue) static void splitcfg(const std::string &cfg, std::list<std::string> &defines, const std::string &defaultValue)
{ {
for (std::string::size_type pos1 = 0U; pos1 < cfg.size();) { for (std::string::size_type defineStartPos = 0U; defineStartPos < cfg.size();) {
const std::string::size_type pos2 = cfg.find(";",pos1); const std::string::size_type defineEndPos = cfg.find(";", defineStartPos);
std::string def = (pos2 == std::string::npos) ? cfg.substr(pos1) : cfg.substr(pos1, pos2 - pos1); std::string def = (defineEndPos == std::string::npos) ? cfg.substr(defineStartPos) : cfg.substr(defineStartPos, defineEndPos - defineStartPos);
if (!defaultValue.empty() && def.find("=") == std::string::npos) if (!defaultValue.empty() && def.find("=") == std::string::npos)
def += '=' + defaultValue; def += '=' + defaultValue;
defines.push_back(def); defines.push_back(def);
pos1 = (pos2 == std::string::npos) ? pos2 : pos2 + 1U; if (defineEndPos == std::string::npos)
break;
defineStartPos = defineEndPos + 1U;
} }
} }