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

Makefile: explicit list directories which should be used with ctags. Run astyle.

This commit is contained in:
Alexander Mai 2015-11-15 19:03:18 +01:00
parent f0bf749621
commit 65666a1ba4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -284,7 +284,7 @@ man/cppcheck.1: $(MAN_SOURCE)
$(XP) $(DB2MAN) $(MAN_SOURCE) $(XP) $(DB2MAN) $(MAN_SOURCE)
tags: tags:
ctags -R --exclude=doxyoutput . ctags -R --exclude=doxyoutput --exclude=test/cfg cli externals gui lib test
install: cppcheck install: cppcheck
install -d ${BIN} install -d ${BIN}

2
lib/checkother.cpp
View File

@ -561,7 +561,7 @@ void CheckOther::checkRedundantAssignment()
if (printWarning && scope->type == Scope::eSwitch && Token::findmatch(it->second, "default|case", tok)) if (printWarning && scope->type == Scope::eSwitch && Token::findmatch(it->second, "default|case", tok))
redundantAssignmentInSwitchError(it->second, tok, tok->str()); redundantAssignmentInSwitchError(it->second, tok, tok->str());
else if (printPerformance) { else if (printPerformance) {
// See #7133 // See #7133
const bool nonlocal = it->second->variable() && nonLocal(it->second->variable()); const bool nonlocal = it->second->variable() && nonLocal(it->second->variable());
if (printInconclusive || !nonlocal) // see #5089 - report inconclusive only when requested if (printInconclusive || !nonlocal) // see #5089 - report inconclusive only when requested
if (_tokenizer->isC() || checkExceptionHandling(tok)) // see #6555 to see how exception handling might have an impact if (_tokenizer->isC() || checkExceptionHandling(tok)) // see #6555 to see how exception handling might have an impact

10
test/testother.cpp
View File

@ -148,7 +148,7 @@ private:
TEST_CASE(incompleteArrayFill); TEST_CASE(incompleteArrayFill);
TEST_CASE(redundantVarAssignment); TEST_CASE(redundantVarAssignment);
TEST_CASE(redundantVarAssignment_7133); TEST_CASE(redundantVarAssignment_7133);
TEST_CASE(redundantMemWrite); TEST_CASE(redundantMemWrite);
TEST_CASE(varFuncNullUB); TEST_CASE(varFuncNullUB);
@ -5619,11 +5619,11 @@ private:
" memptr = 0;\n" " memptr = 0;\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Variable 'memptr' is reassigned a value before the old one has been used.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Variable 'memptr' is reassigned a value before the old one has been used.\n", errout.str());
} }
void redundantVarAssignment_7133() { void redundantVarAssignment_7133() {
// #7133 // #7133
check("sal_Int32 impl_Export() {\n" check("sal_Int32 impl_Export() {\n"
" try {\n" " try {\n"
" try {\n" " try {\n"
" uno::Sequence< uno::Any > aArgs(2);\n" " uno::Sequence< uno::Any > aArgs(2);\n"
@ -5640,7 +5640,7 @@ private:
" }\n" " }\n"
" catch (const uno::Exception&) {\n" " catch (const uno::Exception&) {\n"
" }\n" " }\n"
"}", "test.cpp", false, true); "}", "test.cpp", false, true);
ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:9]: (performance) Variable 'Name' is reassigned a value before the old one has been used.\n", errout.str()); ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:9]: (performance) Variable 'Name' is reassigned a value before the old one has been used.\n", errout.str());
} }

2
tools/dmake.cpp
View File

@ -427,7 +427,7 @@ int main(int argc, char **argv)
fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n"; fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n"; fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
fout << "tags:\n"; fout << "tags:\n";
fout << "\tctags -R --exclude=doxyoutput .\n\n"; fout << "\tctags -R --exclude=doxyoutput --exclude=test/cfg cli externals gui lib test\n\n";
fout << "install: cppcheck\n"; fout << "install: cppcheck\n";
fout << "\tinstall -d ${BIN}\n"; fout << "\tinstall -d ${BIN}\n";
fout << "\tinstall cppcheck ${BIN}\n"; fout << "\tinstall cppcheck ${BIN}\n";