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

Cleanup CheckFunctions::checkIgnoredReturnValue

This commit is contained in:
Daniel Marjamäki 2017-04-12 10:44:08 +02:00
parent b97779591e
commit d252a64ec8
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/checkfunctions.cpp
View File

@ -159,30 +159,8 @@ void CheckFunctions::checkIgnoredReturnValue()
// skip c++11 initialization, ({...}) // skip c++11 initialization, ({...})
if (Token::Match(tok, "%var%|(|, {")) if (Token::Match(tok, "%var%|(|, {"))
tok = tok->linkAt(1); tok = tok->linkAt(1);
else if (tok->str() == "(")
if (Token::Match(tok->previous(), "%name% (")) {
bool semicolon = false;
for (const Token *tok2 = tok->tokAt(2); tok2 && tok2->str() != ")"; tok2 = tok2->next()) {
if (tok2->str() == ";")
semicolon = true;
else if (Token::Match(tok2, "[({]"))
tok2 = tok2->link();
}
if (semicolon)
tok = tok->link(); tok = tok->link();
}
if (Token::simpleMatch(tok, ") (") && Token::Match(tok->link()->previous(), "%name% (")) {
while (tok && tok->str() != ";") {
if (Token::Match(tok, "(|["))
tok = tok->link();
else
tok = tok->next();
}
if (!tok)
break;
continue;
}
if (tok->varId() || !Token::Match(tok, "%name% (")) if (tok->varId() || !Token::Match(tok, "%name% ("))
continue; continue;