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

Merge branch 'master' of https://github.com/danmar/cppcheck

This commit is contained in:
Martin Ettl 2014-09-29 22:10:27 +02:00
parent 4c3e721bf3 5eeb1dea91
commit 924fb90ae0
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfg/std.cfg
View File

@ -320,7 +320,7 @@
<leak-ignore/>
<arg nr="1"><not-uninit/></arg>
</function>
<function name="log"><use-retval/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
<function name="log"><!--<use-retval/>--><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
<function name="log10"><use-retval/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
<function name="longjmp">
<noreturn>false</noreturn>

2
lib/checkother.cpp
View File

@ -2754,7 +2754,7 @@ void CheckOther::checkReturnIgnoredReturnValue()
for (std::size_t i = 0; i < functions; ++i) {
const Scope * scope = symbolDatabase->functionScopes[i];
for (const Token* tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) {
if (tok->varId() || !Token::Match(tok, "%var% ("))
if (tok->varId() || !Token::Match(tok, "%var% (") || tok->strAt(-1) == ".")
continue;
if (!tok->next()->astParent() && _settings->library.useretval.find(tok->str()) != _settings->library.useretval.end())

4
man/manual.docbook
View File

@ -949,6 +949,10 @@ Checking useretval.c...
&lt;/message&gt;
&lt;/rule&gt;</programlisting>
<para>CDATA can be used to include characters in a pattern that might interfere with XML:</para>
<programlisting>&lt;![CDATA[some&lt;strange&gt;pattern]]&gt;</programlisting>
<section>
<title>&lt;tokenlist&gt;</title>

6
test/testother.cpp
View File

@ -6285,6 +6285,12 @@ private:
" std::ofstream log(logfile.c_str(), std::ios::out);\n"
"}", "test.cpp", false, false, false, true, &settings_std);
ASSERT_EQUALS("", errout.str());
// #6197
check("void foo() {\n"
" DebugLog::getInstance().log(systemInfo.getSystemInfo());\n"
"}", "test.cpp", false, false, false, true, &settings_std);
ASSERT_EQUALS("", errout.str());
}
};