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

Improved --check-library messages

This commit is contained in:
Daniel Marjamäki 2013-07-16 18:50:25 +02:00
parent c071d752e0
commit 6fe1b92a47
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/checkleakautovar.cpp
View File

@ -96,11 +96,11 @@ void CheckLeakAutoVar::deallocReturnError(const Token *tok, const std::string &v
void CheckLeakAutoVar::configurationInfo(const Token* tok, const std::string &functionName) void CheckLeakAutoVar::configurationInfo(const Token* tok, const std::string &functionName)
{ {
if (_settings->checkLibrary) { if (_settings->checkLibrary && _settings->isEnabled("information")) {
reportError(tok, reportError(tok,
Severity::information, Severity::information,
"leakconfiguration", "checkLibraryUseIgnore",
functionName + " configuration is needed to establish if there is a leak or not"); "--check-library: Function " + functionName + "() should have <use>/<ignore> configuration");
} }
} }

7
lib/tokenize.cpp
View File

@ -7760,6 +7760,13 @@ bool Tokenizer::IsScopeNoReturn(const Token *endScopeToken, bool *unknown) const
return true; return true;
if (_settings->library.isnotnoreturn(tok->next()->str())) if (_settings->library.isnotnoreturn(tok->next()->str()))
return false; return false;
if (_settings->checkLibrary && _settings->isEnabled("information")) {
reportError(tok->next(),
Severity::information,
"checkLibraryNoReturn",
"--check-library: Function " + tok->next()->str() + "() should have <noreturn> configuration");
}
} }
if (Token::Match(tok, "[;{}]")) { if (Token::Match(tok, "[;{}]")) {

26
test/testleakautovar.cpp
View File

@ -217,7 +217,7 @@ private:
" char *p = malloc(10);\n" " char *p = malloc(10);\n"
" x = a(b(p));\n" " x = a(b(p));\n"
"}"); "}");
ASSERT_EQUALS("[test.c:4]: (information) b configuration is needed to establish if there is a leak or not\n", errout.str()); ASSERT_EQUALS("[test.c:4]: (information) --check-library: Function b() should have <use>/<ignore> configuration\n", errout.str());
} }
void assign12() { // #4236: FP. bar(&x) void assign12() { // #4236: FP. bar(&x)
@ -259,13 +259,13 @@ private:
" free(p);\n" " free(p);\n"
" strcpy(a, p);\n" " strcpy(a, p);\n"
"}"); "}");
TODO_ASSERT_EQUALS("error", "", errout.str()); TODO_ASSERT_EQUALS("error (free,use)", "[test.c:3]: (information) --check-library: Function strcpy() should have <noreturn> configuration\n", errout.str());
check("void f(char *p) {\n" // #3041 - assigning pointer when it's used check("void f(char *p) {\n" // #3041 - assigning pointer when it's used
" free(p);\n" " free(p);\n"
" strcpy(a, p=b());\n" " strcpy(a, p=b());\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); TODO_ASSERT_EQUALS("", "[test.c:3]: (information) --check-library: Function strcpy() should have <noreturn> configuration\n", errout.str());
} }
void deallocuse3() { void deallocuse3() {
@ -334,7 +334,9 @@ private:
" char *p = malloc(10);\n" " char *p = malloc(10);\n"
" fatal_error();\n" " fatal_error();\n"
"}"); "}");
ASSERT_EQUALS("[test.c:4]: (information) fatal_error configuration is needed to establish if there is a leak or not\n", errout.str()); ASSERT_EQUALS("[test.c:3]: (information) --check-library: Function fatal_error() should have <noreturn> configuration\n"
"[test.c:4]: (information) --check-library: Function fatal_error() should have <use>/<ignore> configuration\n",
errout.str());
} }
void goto1() { void goto1() {
@ -577,7 +579,9 @@ private:
" char *p = malloc(10);\n" " char *p = malloc(10);\n"
" x(p);\n" " x(p);\n"
"}"); "}");
ASSERT_EQUALS("[test.c:4]: (information) x configuration is needed to establish if there is a leak or not\n", errout.str()); ASSERT_EQUALS("[test.c:3]: (information) --check-library: Function x() should have <noreturn> configuration\n"
"[test.c:4]: (information) --check-library: Function x() should have <use>/<ignore> configuration\n",
errout.str());
} }
void configuration2() { void configuration2() {
@ -587,7 +591,9 @@ private:
" char *p = malloc(10);\n" " char *p = malloc(10);\n"
" x(&p);\n" " x(&p);\n"
"}"); "}");
ASSERT_EQUALS("[test.c:4]: (information) x configuration is needed to establish if there is a leak or not\n", errout.str()); ASSERT_EQUALS("[test.c:3]: (information) --check-library: Function x() should have <noreturn> configuration\n"
"[test.c:4]: (information) --check-library: Function x() should have <use>/<ignore> configuration\n",
errout.str());
} }
void configuration3() { void configuration3() {
@ -595,14 +601,14 @@ private:
" char *p = malloc(10);\n" " char *p = malloc(10);\n"
" if (set_data(p)) { }\n" " if (set_data(p)) { }\n"
"}"); "}");
ASSERT_EQUALS("[test.c:4]: (information) set_data configuration is needed to establish if there is a leak or not\n", errout.str()); ASSERT_EQUALS("[test.c:4]: (information) --check-library: Function set_data() should have <use>/<ignore> configuration\n", errout.str());
check("void f() {\n" check("void f() {\n"
" char *p = malloc(10);\n" " char *p = malloc(10);\n"
" if (set_data(p)) { return; }\n" " if (set_data(p)) { return; }\n"
"}"); "}");
ASSERT_EQUALS("[test.c:3]: (information) set_data configuration is needed to establish if there is a leak or not\n" ASSERT_EQUALS("[test.c:3]: (information) --check-library: Function set_data() should have <use>/<ignore> configuration\n"
"[test.c:4]: (information) set_data configuration is needed to establish if there is a leak or not\n" "[test.c:4]: (information) --check-library: Function set_data() should have <use>/<ignore> configuration\n"
, errout.str()); , errout.str());
} }
@ -612,7 +618,7 @@ private:
" int ret = set_data(p);\n" " int ret = set_data(p);\n"
" return ret;\n" " return ret;\n"
"}"); "}");
ASSERT_EQUALS("[test.c:4]: (information) set_data configuration is needed to establish if there is a leak or not\n", errout.str()); ASSERT_EQUALS("[test.c:4]: (information) --check-library: Function set_data() should have <use>/<ignore> configuration\n", errout.str());
} }
void ptrptr() { void ptrptr() {