From f7c6140e1a3444b7925b7ad2524a873f07caeda8 Mon Sep 17 00:00:00 2001 From: Boris Egorov Date: Sun, 5 Jul 2015 17:15:13 +0200 Subject: [PATCH] checkautovariables: Simplify some conditions --- lib/checkautovariables.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp index 81ad3c65e..0d360a76e 100644 --- a/lib/checkautovariables.cpp +++ b/lib/checkautovariables.cpp @@ -159,8 +159,7 @@ void CheckAutoVariables::autoVariables() } else if (Token::Match(tok, "[;{}] %var% . %var% = & %var%")) { // TODO: check if the parameter is only changed temporarily (#2969) if (printInconclusive) { - const Variable * var1 = tok->next()->variable(); - if (var1 && var1->isArgument() && var1->isPointer()) { + if (isPtrArg(tok->next())) { const Token * const var2tok = tok->tokAt(6); if (isAutoVar(var2tok) && checkRvalueExpression(var2tok)) errorAutoVariableAssignment(tok->next(), true); @@ -170,8 +169,7 @@ void CheckAutoVariables::autoVariables() } else if (Token::Match(tok, "[;{}] %var% . %var% = %var% ;")) { // TODO: check if the parameter is only changed temporarily (#2969) if (printInconclusive) { - const Variable * var1 = tok->next()->variable(); - if (var1 && var1->isArgument() && var1->isPointer()) { + if (isPtrArg(tok->next())) { if (isAutoVarArray(tok->tokAt(5))) errorAutoVariableAssignment(tok->next(), true); }