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

Merge pull request #125 from lioncash/cdghz 

cdvdGigaherz: Simplify the loops within readLine and readLineW
This commit is contained in:
David Quintana 2014-07-15 11:53:36 +02:00
parent 764ca25f8d 1fa95de554
commit 1736c1e32e
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/cdvdGigaherz/src/FileStream.cpp
View File

@ -98,20 +98,17 @@ int FileStream::read(byte* b, int len)
string FileStream::readLine()
{
string s;
char c;
s.clear();
do {
if(eof())
while (!eof())
{
char c = read();
if ((c == '\n') || (c == '\r') || (c == '\0'))
break;
c = read();
if((c=='\n')||(c=='\r')||(c==0))
break;
s.append(1,c);
} while(true);
s.append(1, c);
}
return s;
}
@ -119,20 +116,17 @@ string FileStream::readLine()
wstring FileStream::readLineW()
{
wstring s;
wchar_t c;
s.clear();
do {
if(eof())
while (!eof())
{
wchar_t c = read<wchar_t>();
if ((c == L'\n') || (c == L'\r') || (c == L'\0'))
break;
c = read<wchar_t>();
if((c==L'\n')||(c==L'\r')||(c==0))
break;
s.append(1,c);
} while(true);
s.append(1, c);
}
return s;
}