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

Move string comparison out of the report function

This commit is contained in:
Richard Quirk 2011-10-29 11:52:19 +02:00
parent 665cdfabdc
commit c2d7824130
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/checkother.cpp
View File

@ -2306,7 +2306,10 @@ void CheckOther::checkAlwaysTrueOrFalseStringCompare()
while (tok && (tok = Token::findmatch(tok, pattern3)) != NULL) { while (tok && (tok = Token::findmatch(tok, pattern3)) != NULL) {
const Token *var1 = tok->tokAt(2); const Token *var1 = tok->tokAt(2);
const Token *var2 = tok->tokAt(4); const Token *var2 = tok->tokAt(4);
alwaysTrueStringVariableCompareError(tok, var1->str(), var2->str()); const std::string &str1 = var1->str();
const std::string &str2 = var2->str();
if (str1 == str2)
alwaysTrueStringVariableCompareError(tok, str1, str2);
tok = tok->tokAt(5); tok = tok->tokAt(5);
} }
} }
@ -2333,12 +2336,10 @@ void CheckOther::alwaysTrueFalseStringCompareError(const Token *tok, const std::
void CheckOther::alwaysTrueStringVariableCompareError(const Token *tok, const std::string& str1, const std::string& str2) void CheckOther::alwaysTrueStringVariableCompareError(const Token *tok, const std::string& str1, const std::string& str2)
{ {
if (str1 == str2) { reportError(tok, Severity::warning, "stringCompare",
reportError(tok, Severity::warning, "stringCompare", "Comparison of identical string variables.\n"
"Comparison of identical string variables.\n" "The compared strings, '" + str1 + "' and '" + str2 + "', are identical. "
"The compared strings, '" + str1 + "' and '" + str2 + "', are identical. " "This could be a logic bug.");
"This could be a logic bug.");
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------