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

Removed unnecessary pattern "const|" - typeStartToken() never points to "const"

This commit is contained in:
PKEuS 2012-11-29 10:47:52 -08:00
parent 68327b3c64
commit 0db2675912
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkstl.cpp
View File

@ -1196,7 +1196,7 @@ void CheckStl::string_c_str()
tok2 = tok2->previous(); tok2 = tok2->previous();
if (tok2 && Token::simpleMatch(tok2->tokAt(-4), ". c_str ( )")) { if (tok2 && Token::simpleMatch(tok2->tokAt(-4), ". c_str ( )")) {
const Variable* var = symbolDatabase->getVariableFromVarId(tok2->tokAt(-5)->varId()); const Variable* var = symbolDatabase->getVariableFromVarId(tok2->tokAt(-5)->varId());
if (var && Token::Match(var->typeStartToken(), "const| std ::")) if (var && Token::simpleMatch(var->typeStartToken(), "std ::"))
string_c_strParam(tok, i->second); string_c_strParam(tok, i->second);
} }
} }
@ -1242,7 +1242,7 @@ void CheckStl::string_c_str()
tok2 = tok2->tokAt(-5); tok2 = tok2->tokAt(-5);
if (tok2->isName()) { // return var.c_str(); => check if var is a std type if (tok2->isName()) { // return var.c_str(); => check if var is a std type
const Variable* var = symbolDatabase->getVariableFromVarId(tok2->varId()); const Variable* var = symbolDatabase->getVariableFromVarId(tok2->varId());
if (var && Token::Match(var->typeStartToken(), "const| std ::")) if (var && Token::simpleMatch(var->typeStartToken(), "std ::"))
string_c_strReturn(tok); string_c_strReturn(tok);
} else { } else {
// TODO: determine if a error should be written or not // TODO: determine if a error should be written or not