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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2020-10-25 07:12:30 +01:00
parent d55874ec37
commit 05514950af
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/checkunusedvar.cpp
View File

@ -1134,11 +1134,9 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
variables.read(tok2->varId(), tok); variables.read(tok2->varId(), tok);
} }
} }
} } else if (tok->variable() && tok->variable()->isClass() && tok->variable()->type() &&
else if (tok->variable() && tok->variable()->isClass() && tok->variable()->type() &&
(tok->variable()->type()->needInitialization == Type::NeedInitialization::False) && (tok->variable()->type()->needInitialization == Type::NeedInitialization::False) &&
tok->next()->str() == ";") tok->next()->str() == ";") {
{
variables.write(tok->varId(), tok); variables.write(tok->varId(), tok);
} }
} }
@ -1500,27 +1498,23 @@ bool CheckUnusedVar::isRecordTypeWithoutSideEffects(const Type* type)
// validating initialization list // validating initialization list
nextToken = nextToken->next(); // goto ":" nextToken = nextToken->next(); // goto ":"
for (const Token *initListToken = nextToken; Token::Match(initListToken, "[:,] %var% [({]"); initListToken = initListToken->linkAt(2)->next()) for (const Token *initListToken = nextToken; Token::Match(initListToken, "[:,] %var% [({]"); initListToken = initListToken->linkAt(2)->next()) {
{
const Token* varToken = initListToken->next(); const Token* varToken = initListToken->next();
const Variable* variable = varToken->variable(); const Variable* variable = varToken->variable();
if (variable && !isVariableWithoutSideEffects(*variable)) if (variable && !isVariableWithoutSideEffects(*variable)) {
{
return withoutSideEffects = false; return withoutSideEffects = false;
} }
const Token* valueEnd = initListToken->linkAt(2); const Token* valueEnd = initListToken->linkAt(2);
for (const Token* valueToken = initListToken->tokAt(3); valueToken != valueEnd; valueToken = valueToken->next()) { for (const Token* valueToken = initListToken->tokAt(3); valueToken != valueEnd; valueToken = valueToken->next()) {
const Variable* initValueVar = valueToken->variable(); const Variable* initValueVar = valueToken->variable();
if (initValueVar && !isVariableWithoutSideEffects(*initValueVar)) if (initValueVar && !isVariableWithoutSideEffects(*initValueVar)) {
{
return withoutSideEffects = false; return withoutSideEffects = false;
} }
if ((valueToken->tokType() == Token::Type::eFunction) || if ((valueToken->tokType() == Token::Type::eFunction) ||
(valueToken->tokType() == Token::Type::eName) || (valueToken->tokType() == Token::Type::eName) ||
(valueToken->tokType() == Token::Type::eLambda) || (valueToken->tokType() == Token::Type::eLambda) ||
(valueToken->tokType() == Token::Type::eOther)) (valueToken->tokType() == Token::Type::eOther)) {
{
return withoutSideEffects = false; return withoutSideEffects = false;
} }
} }
@ -1540,8 +1534,7 @@ bool CheckUnusedVar::isRecordTypeWithoutSideEffects(const Type* type)
// Is there a member variable with possible side effects // Is there a member variable with possible side effects
for (const Variable& var : type->classScope->varlist) { for (const Variable& var : type->classScope->varlist) {
withoutSideEffects = isVariableWithoutSideEffects(var); withoutSideEffects = isVariableWithoutSideEffects(var);
if (!withoutSideEffects) if (!withoutSideEffects) {
{
return withoutSideEffects; return withoutSideEffects;
} }
} }