mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-07 09:15:00 -06:00
4.60 beta
This commit is contained in:
committed by
Kornel Lesiński
parent
173c07e166
commit
c10e6b16f6
@@ -31,7 +31,7 @@ bool CStdInStream::Open(LPCTSTR fileName)
|
||||
|
||||
bool CStdInStream::Close()
|
||||
{
|
||||
if(!_streamIsOpen)
|
||||
if (!_streamIsOpen)
|
||||
return true;
|
||||
_streamIsOpen = (fclose(_stream) != 0);
|
||||
return !_streamIsOpen;
|
||||
@@ -48,12 +48,12 @@ AString CStdInStream::ScanStringUntilNewLine()
|
||||
for (;;)
|
||||
{
|
||||
int intChar = GetChar();
|
||||
if(intChar == EOF)
|
||||
if (intChar == EOF)
|
||||
throw kEOFMessage;
|
||||
char c = char(intChar);
|
||||
if (c == kIllegalChar)
|
||||
throw kIllegalCharMessage;
|
||||
if(c == kNewLineChar)
|
||||
if (c == kNewLineChar)
|
||||
break;
|
||||
s += c;
|
||||
}
|
||||
@@ -64,7 +64,7 @@ void CStdInStream::ReadToString(AString &resultString)
|
||||
{
|
||||
resultString.Empty();
|
||||
int c;
|
||||
while((c = GetChar()) != EOF)
|
||||
while ((c = GetChar()) != EOF)
|
||||
resultString += char(c);
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ bool CStdInStream::Eof()
|
||||
int CStdInStream::GetChar()
|
||||
{
|
||||
int c = fgetc(_stream); // getc() doesn't work in BeOS?
|
||||
if(c == EOF && !Eof())
|
||||
if (c == EOF && !Eof())
|
||||
throw kReadErrorMessage;
|
||||
return c;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user