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

Uninitialized Variables: some additional tweaks. Try to fix Travis

This commit is contained in:
Daniel Marjamäki 2018-01-15 17:35:21 +01:00
parent 100887429d
commit f2b2e87fb6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/checkuninitvar.cpp
View File

@ -1290,6 +1290,7 @@ std::string CheckUninitVar::MyFileInfo::toString() const
ret << " <unsafefunctionarg" ret << " <unsafefunctionarg"
<< " functionName=\"" << it->functionName << '\"' << " functionName=\"" << it->functionName << '\"'
<< " argnr=\"" << it->argnr << '\"' << " argnr=\"" << it->argnr << '\"'
<< " variableName=\"" << it->variableName << "\""
<< " fileName=\"" << it->location.fileName << '\"' << " fileName=\"" << it->location.fileName << '\"'
<< " linenr=\"" << it->location.linenr << '\"' << " linenr=\"" << it->location.linenr << '\"'
<< "/>\n"; << "/>\n";
@ -1298,6 +1299,7 @@ std::string CheckUninitVar::MyFileInfo::toString() const
ret << " <uninitializedFunctionArgs" ret << " <uninitializedFunctionArgs"
<< " functionName=\"" << it->functionName << '\"' << " functionName=\"" << it->functionName << '\"'
<< " argnr=\"" << it->argnr << '\"' << " argnr=\"" << it->argnr << '\"'
<< " variableName=\"" << it->variableName << "\""
<< " fileName=\"" << it->location.fileName << '\"' << " fileName=\"" << it->location.fileName << '\"'
<< " linenr=\"" << it->location.linenr << '\"' << " linenr=\"" << it->location.linenr << '\"'
<< "/>\n"; << "/>\n";
@ -1314,7 +1316,7 @@ Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer *tokenizer, const S
// Parse all functions in TU // Parse all functions in TU
for (scope = symbolDatabase->scopeList.begin(); scope != symbolDatabase->scopeList.end(); ++scope) { for (scope = symbolDatabase->scopeList.begin(); scope != symbolDatabase->scopeList.end(); ++scope) {
if (!scope->isExecutable() || scope->type != Scope::eFunction) if (!scope->isExecutable() || scope->type != Scope::eFunction || !scope->function)
continue; continue;
const Function *const function = scope->function; const Function *const function = scope->function;
@ -1395,7 +1397,7 @@ Check::FileInfo * CheckUninitVar::loadFileInfoFromXml(const tinyxml2::XMLElement
bool CheckUninitVar::analyseWholeProgram(const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) bool CheckUninitVar::analyseWholeProgram(const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
{ {
(void)settings; // This argument is unused (void)settings; // This argument is unused
// Merge all fileinfo.. // Merge all fileinfo..
MyFileInfo all; MyFileInfo all;