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

Read attribute once, better variable name

This commit is contained in:
Dmitry-Me 2017-08-24 18:28:52 +03:00
parent 3bcfc33014
commit 61e290750e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/importproject.cpp
View File

@ -385,25 +385,26 @@ static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::
} }
} }
if (node->Attribute("Label") && std::strcmp(node->Attribute("Label"),"UserMacros")==0) { const char* labelAttribute = node->Attribute("Label");
if (labelAttribute && std::strcmp(labelAttribute, "UserMacros") == 0) {
for (const tinyxml2::XMLElement *propertyGroup = node->FirstChildElement(); propertyGroup; propertyGroup = propertyGroup->NextSiblingElement()) { for (const tinyxml2::XMLElement *propertyGroup = node->FirstChildElement(); propertyGroup; propertyGroup = propertyGroup->NextSiblingElement()) {
const std::string name(propertyGroup->Name()); const std::string name(propertyGroup->Name());
const char *text = propertyGroup->GetText(); const char *text = propertyGroup->GetText();
(*variables)[name] = std::string(text ? text : ""); (*variables)[name] = std::string(text ? text : "");
} }
} else if (!node->Attribute("Label")) { } else if (!labelAttribute) {
for (const tinyxml2::XMLElement *propertyGroup = node->FirstChildElement(); propertyGroup; propertyGroup = propertyGroup->NextSiblingElement()) { for (const tinyxml2::XMLElement *propertyGroup = node->FirstChildElement(); propertyGroup; propertyGroup = propertyGroup->NextSiblingElement()) {
if (std::strcmp(propertyGroup->Name(), "IncludePath") != 0) if (std::strcmp(propertyGroup->Name(), "IncludePath") != 0)
continue; continue;
const char *text = propertyGroup->GetText(); const char *text = propertyGroup->GetText();
if (!text) if (!text)
continue; continue;
std::string s(text); std::string path(text);
std::string::size_type pos = s.find("$(IncludePath)"); std::string::size_type pos = path.find("$(IncludePath)");
if (pos != std::string::npos) if (pos != std::string::npos)
s = s.substr(0,pos) + *includePath + s.substr(pos+14U); path = path.substr(0,pos) + *includePath + path.substr(pos+14U);
*includePath = s; *includePath = path;
} }
} }
} }