CppcheckExecutor: Code cleanups and fixes
This commit is contained in:
parent
3159df958d
commit
882d4d95a4
|
@ -65,21 +65,20 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
|
||||||
|
|
||||||
// Check that all include paths exist
|
// Check that all include paths exist
|
||||||
{
|
{
|
||||||
std::list<std::string>::reverse_iterator iter;
|
std::list<std::string>::iterator iter;
|
||||||
for (iter = _settings._includePaths.rbegin();
|
for (iter = _settings._includePaths.begin();
|
||||||
iter != _settings._includePaths.rend();
|
iter != _settings._includePaths.end();
|
||||||
++iter)
|
)
|
||||||
{
|
{
|
||||||
const std::string path(Path::toNativeSeparators(*iter));
|
const std::string path(Path::toNativeSeparators(*iter));
|
||||||
if (!FileLister::isDirectory(path))
|
if (FileLister::isDirectory(path))
|
||||||
|
++iter;
|
||||||
|
else
|
||||||
{
|
{
|
||||||
// If the include path is not found, warn user and remove the
|
// If the include path is not found, warn user and remove the
|
||||||
// non-existing path from the list.
|
// non-existing path from the list.
|
||||||
std::cout << "cppcheck: warning: Couldn't find path given by -I '" + path + "'" << std::endl;
|
std::cout << "cppcheck: warning: Couldn't find path given by -I '" + path + "'" << std::endl;
|
||||||
std::list<std::string>::iterator del_iter(iter.base());
|
iter = _settings._includePaths.erase(iter);
|
||||||
--del_iter;
|
|
||||||
++iter;
|
|
||||||
_settings._includePaths.erase(del_iter);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue