ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #369 from lioncash/ini 

Use size_t in std::string operations in IniFile.cpp, not int
This commit is contained in:
Pierre Bourdon 2014-05-17 17:42:08 +02:00
parent 0fac17da33 d0bd4119d1
commit 396e13de89
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Common/IniFile.cpp
View File

@ -26,13 +26,17 @@ void ParseLine(const std::string& line, std::string* keyOut, std::string* valueO
if (line[0] == '#') if (line[0] == '#')
return; return;
int FirstEquals = (int)line.find("=", 0); size_t firstEquals = line.find("=", 0);
if (FirstEquals >= 0) if (firstEquals != std::string::npos)
{ {
// Yes, a valid line! // Yes, a valid line!
*keyOut = StripSpaces(line.substr(0, FirstEquals)); *keyOut = StripSpaces(line.substr(0, firstEquals));
if (valueOut) *valueOut = StripQuotes(StripSpaces(line.substr(FirstEquals + 1, std::string::npos)));
if (valueOut)
{
*valueOut = StripQuotes(StripSpaces(line.substr(firstEquals + 1, std::string::npos)));
}
} }
} }
@ -298,13 +302,13 @@ bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>*
if (remove_comments) if (remove_comments)
{ {
int commentPos = (int)line.find('#'); size_t commentPos = line.find('#');
if (commentPos == 0) if (commentPos == 0)
{ {
continue; continue;
} }
if (commentPos != (int)std::string::npos) if (commentPos != std::string::npos)
{ {
line = StripSpaces(line.substr(0, commentPos)); line = StripSpaces(line.substr(0, commentPos));
} }