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

Fixed #1836 (--suppresions file.txt fails due to wrong line edings)

This commit is contained in:
Daniel Marjamäki 2010-07-09 12:42:08 +02:00
parent 2531bb73d7
commit abbd557761
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/settings.cpp
View File

@ -45,8 +45,17 @@ Settings::Settings()
bool Settings::Suppressions::parseFile(std::istream &istr) bool Settings::Suppressions::parseFile(std::istream &istr)
{ {
// Change '\r' to '\n' in the istr
std::string filedata;
std::string line; std::string line;
while (getline(istr, line)) while (std::getline(istr, line))
filedata += line + "\n";
while (filedata.find("\r") != std::string::npos)
filedata[filedata.find("\r")] = '\n';
// Parse filedata..
std::istringstream istr2(filedata);
while (std::getline(istr2, line))
{ {
// Skip empty lines // Skip empty lines
if (line.empty()) if (line.empty())