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

Merge branch '2390b' of https://github.com/elfring/cppcheck into elfring-2390b

This commit is contained in:
Daniel Marjamäki 2011-03-12 11:58:24 +01:00
parent 2716b856f4 3fc0317997
commit 29ab409af5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkother.cpp
View File

@ -3073,8 +3073,8 @@ void CheckOther::variableScopeError(const Token *tok, const std::string &varname
reportError(tok, reportError(tok,
Severity::information, Severity::information,
"variableScope", "variableScope",
"The scope of the variable " + varname + " can be reduced\n" "The scope of the variable '" + varname + "' can be reduced\n"
"The scope of the variable " + varname + " can be reduced. Warning: It can be unsafe " "The scope of the variable '" + varname + "' can be reduced. Warning: It can be unsafe "
"to fix this message. Be careful. Especially when there are inner loops. Here is an " "to fix this message. Be careful. Especially when there are inner loops. Here is an "
"example where cppcheck will write that the scope for 'i' can be reduced:\n" "example where cppcheck will write that the scope for 'i' can be reduced:\n"
"void f(int x)\n" "void f(int x)\n"

6
test/testother.cpp
View File

@ -547,7 +547,7 @@ private:
" for ( ; i < 10; ++i) ;\n" " for ( ; i < 10; ++i) ;\n"
" }\n" " }\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:3]: (information) The scope of the variable i can be reduced\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (information) The scope of the variable 'i' can be reduced\n", errout.str());
varScope("void f(int x)\n" varScope("void f(int x)\n"
"{\n" "{\n"
@ -557,7 +557,7 @@ private:
" for ( ; i < 10; ++i) ;\n" " for ( ; i < 10; ++i) ;\n"
" }\n" " }\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:3]: (information) The scope of the variable i can be reduced\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (information) The scope of the variable 'i' can be reduced\n", errout.str());
} }
void varScope6() void varScope6()
@ -623,7 +623,7 @@ private:
" edgeResistance = (edge+1) / 2.0;\n" " edgeResistance = (edge+1) / 2.0;\n"
" }\n" " }\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:2]: (information) The scope of the variable edgeResistance can be reduced\n", errout.str()); ASSERT_EQUALS("[test.cpp:2]: (information) The scope of the variable 'edgeResistance' can be reduced\n", errout.str());
} }
void varScope9() void varScope9()