noisymime
/
cppcheck
mirror of https://github.com/noisymime/cppcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #5103 (Don't show 'The scope of the variable can be reduced' if there is no explicit block with { })

This commit is contained in:
Daniel Marjamäki 2013-10-19 17:27:02 +02:00
parent 7f9f624215
commit 6aa03efa2f
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkother.cpp
View File

@ -1734,6 +1734,9 @@ void CheckOther::checkVariableScope()
if (!var || !var->isLocal() || (!var->isPointer() && !var->typeStartToken()->isStandardType() && !var->typeStartToken()->next()->isStandardType())) if (!var || !var->isLocal() || (!var->isPointer() && !var->typeStartToken()->isStandardType() && !var->typeStartToken()->next()->isStandardType()))
continue; continue;
if (var->isConst())
continue;
bool forHead = false; // Don't check variables declared in header of a for loop bool forHead = false; // Don't check variables declared in header of a for loop
for (const Token* tok = var->typeStartToken(); tok; tok = tok->previous()) { for (const Token* tok = var->typeStartToken(); tok; tok = tok->previous()) {
if (tok->str() == "(") { if (tok->str() == "(") {
@ -1750,10 +1753,7 @@ void CheckOther::checkVariableScope()
tok = tok->tokAt(3); tok = tok->tokAt(3);
if (!tok->isNumber() && tok->type() != Token::eString && tok->type() != Token::eChar && !tok->isBoolean()) if (!tok->isNumber() && tok->type() != Token::eString && tok->type() != Token::eChar && !tok->isBoolean())
continue; continue;
} else if ((tok->str() == "=" || tok->str() == "(") && }
((!tok->next()->isNumber() && tok->next()->type() != Token::eString && tok->next()->type() != Token::eChar && !tok->next()->isBoolean()) || tok->strAt(2) != ";"))
continue;
bool reduce = true; bool reduce = true;
bool used = false; // Don't warn about unused variables bool used = false; // Don't warn about unused variables
for (; tok != var->scope()->classEnd; tok = tok->next()) { for (; tok != var->scope()->classEnd; tok = tok->next()) {

15
test/testother.cpp
View File

@ -77,6 +77,7 @@ private:
TEST_CASE(varScope17); TEST_CASE(varScope17);
TEST_CASE(varScope18); TEST_CASE(varScope18);
TEST_CASE(varScope19); // Ticket #4994 TEST_CASE(varScope19); // Ticket #4994
TEST_CASE(varScope20); // Ticket #5103
TEST_CASE(oldStylePointerCast); TEST_CASE(oldStylePointerCast);
TEST_CASE(invalidPointerCast); TEST_CASE(invalidPointerCast);
@ -836,7 +837,7 @@ private:
" for ( ; i < 10; ++i) ;\n" " for ( ; i < 10; ++i) ;\n"
" }\n" " }\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'i' can be reduced.\n", errout.str()); ASSERT_EQUALS("", errout.str());
varScope("void f(int x)\n" varScope("void f(int x)\n"
"{\n" "{\n"
@ -985,7 +986,7 @@ private:
" if (x == 5)\n" " if (x == 5)\n"
" foo(b);\n" " foo(b);\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'b' can be reduced.\n", errout.str()); ASSERT_EQUALS("", errout.str());
varScope("void f(int x) {\n" varScope("void f(int x) {\n"
" const bool b = x;\n" " const bool b = x;\n"
@ -1167,6 +1168,16 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void varScope20() { // Ticket #5103 - constant variable only used in inner scope
varScope("int f(int a) {\n"
" const int x = 234;\n"
" int b = a;\n"
" if (b > 32) b = x;\n"
" return b;\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void checkOldStylePointerCast(const char code[]) { void checkOldStylePointerCast(const char code[]) {
// Clear the error buffer.. // Clear the error buffer..
errout.str(""); errout.str("");