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

Fix 'make checkcfg'

This commit is contained in:
Daniel Marjamäki 2017-05-18 22:10:08 +02:00
parent 340c687cbf
commit 9d08cbf4d2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cppcheck.cpp
View File

@ -74,13 +74,13 @@ const char * CppCheck::extraVersion()
unsigned int CppCheck::check(const std::string &path) unsigned int CppCheck::check(const std::string &path)
{ {
std::ifstream fin(path.c_str()); std::ifstream fin(path.c_str());
return processFile(path, emptyString, fin); return processFile(Path::simplifyPath(path), emptyString, fin);
} }
unsigned int CppCheck::check(const std::string &path, const std::string &content) unsigned int CppCheck::check(const std::string &path, const std::string &content)
{ {
std::istringstream iss(content); std::istringstream iss(content);
return processFile(path, emptyString, iss); return processFile(Path::simplifyPath(path), emptyString, iss);
} }
unsigned int CppCheck::check(const ImportProject::FileSettings &fs) unsigned int CppCheck::check(const ImportProject::FileSettings &fs)
@ -94,7 +94,7 @@ unsigned int CppCheck::check(const ImportProject::FileSettings &fs)
temp._settings.platform(fs.platformType); temp._settings.platform(fs.platformType);
} }
std::ifstream fin(fs.filename.c_str()); std::ifstream fin(fs.filename.c_str());
return temp.processFile(fs.filename, fs.cfg, fin); return temp.processFile(Path::simplifyPath(fs.filename), fs.cfg, fin);
} }
unsigned int CppCheck::processFile(const std::string& filename, const std::string &cfgname, std::istream& fileStream) unsigned int CppCheck::processFile(const std::string& filename, const std::string &cfgname, std::istream& fileStream)