From 78a3a58a5ab242940d7331fdff6207094f82e48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 4 Mar 2013 19:13:49 +0100 Subject: [PATCH] Fixed #4628 (False positive: Variable is assigned a value that is never used) --- lib/checkunusedvar.cpp | 4 +--- test/testunusedvar.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp index 09a950eef..c65162885 100644 --- a/lib/checkunusedvar.cpp +++ b/lib/checkunusedvar.cpp @@ -449,11 +449,9 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de if (Token::Match(tok, "struct|union")) tok = tok->next(); - tok = tok->next(); - if (tok->str() == "*") + while ((tok->isName() && tok->varId() == 0) || (tok->str() == "*") || (tok->str() == ")")) tok = tok->next(); - tok = tok->next(); if (tok->str() == "&") { addressOf = true; tok = tok->next(); diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp index d44d81aac..efa382751 100644 --- a/test/testunusedvar.cpp +++ b/test/testunusedvar.cpp @@ -2735,6 +2735,13 @@ private: " x(b);\n" "}"); ASSERT_EQUALS("", errout.str()); + + functionVariableUsage("int f(void) {\n" // #4628 + " int x=1,y;\n" + " y = (x * a) / 100;\n" + " return y;\n" + "}\n"); + ASSERT_EQUALS("", errout.str()); } void localvarasm() {