Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

detect EOF properly in wxFileInputStream

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-12 18:15:11 +00:00
parent 20ea6894a2
commit 9a26db9ed2
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/wfstream.cpp
View File

@@ -69,17 +69,21 @@ size_t wxFileInputStream::GetSize() const
size_t wxFileInputStream::OnSysRead(void *buffer, size_t size) size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
{ {
off_t ret; off_t ret = m_file->Read(buffer, size);
ret = m_file->Read(buffer, size); switch ( ret )
m_lasterror = wxStream_NOERROR;
if (m_file->Eof())
m_lasterror = wxStream_EOF;
if (ret == wxInvalidOffset)
{ {
m_lasterror = wxStream_READ_ERR; case 0:
m_lasterror = wxSTREAM_EOF;
break;
case wxInvalidOffset:
m_lasterror = wxSTREAM_READ_ERROR;
ret = 0; ret = 0;
break;
default:
m_lasterror = wxSTREAM_NO_ERROR;
} }
return ret; return ret;
@@ -146,10 +150,9 @@ wxFileOutputStream::~wxFileOutputStream()
size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size) size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
{ {
size_t ret = m_file->Write(buffer, size); size_t ret = m_file->Write(buffer, size);
if (m_file->Error())
m_lasterror = wxStream_WRITE_ERR; m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
else
m_lasterror = wxStream_NOERROR;
return ret; return ret;
} }