detect EOF properly in wxFileInputStream

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index c7c06b57babe3cd3be0e8a96fc00aa38157375f0..2b2e68dc6f674910d27a02a70987871492993f1a 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -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;
-
-    ret = m_file->Read(buffer, size);
+    off_t ret = m_file->Read(buffer, size);

 
 

-    m_lasterror = wxStream_NOERROR;
-    if (m_file->Eof())
-        m_lasterror = wxStream_EOF;
-    if (ret == wxInvalidOffset) 
+    switch ( ret )

     {
     {

-        m_lasterror = wxStream_READ_ERR;
-        ret = 0;
+        case 0:
+            m_lasterror = wxSTREAM_EOF;
+            break;
+
+        case wxInvalidOffset:
+            m_lasterror = wxSTREAM_READ_ERROR;
+            ret = 0;
+            break;
+
+        default:
+            m_lasterror = wxSTREAM_NO_ERROR;

     }
 
     return ret;
     }
 
     return ret;


@@ -87,7 +91,7 @@ size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 
 off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
 
 off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {

-    return m_file->Seek(pos, mode) ;
+    return m_file->Seek(pos, mode);

 }
 
 off_t wxFileInputStream::OnSysTell() const
 }
 
 off_t wxFileInputStream::OnSysTell() const


@@ -103,7 +107,7 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 {
     m_file = new wxFile(fileName, wxFile::write);
     m_file_destroy = TRUE;
 {
     m_file = new wxFile(fileName, wxFile::write);
     m_file_destroy = TRUE;

-    
+

     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;
     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;


@@ -122,7 +126,7 @@ wxFileOutputStream::wxFileOutputStream(wxFile& file)
 }
 
 wxFileOutputStream::wxFileOutputStream()
 }
 
 wxFileOutputStream::wxFileOutputStream()

-  : wxOutputStream()
+                  : wxOutputStream()

 {
     m_file_destroy = FALSE;
     m_file = NULL;
 {
     m_file_destroy = FALSE;
     m_file = NULL;


@@ -136,7 +140,7 @@ wxFileOutputStream::wxFileOutputStream(int fd)
 
 wxFileOutputStream::~wxFileOutputStream()
 {
 
 wxFileOutputStream::~wxFileOutputStream()
 {

-    if (m_file_destroy) 
+    if (m_file_destroy)

     {
         Sync();
         delete m_file;
     {
         Sync();
         delete m_file;


@@ -146,10 +150,9 @@ wxFileOutputStream::~wxFileOutputStream()
 size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);
 size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);

-    if (m_file->Error())
-        m_lasterror = wxStream_WRITE_ERR;
-    else
-        m_lasterror = wxStream_NOERROR;
+
+    m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
+

     return ret;
 }
 
     return ret;
 }
 


@@ -233,7 +236,7 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 
     if (m_file->Eof())
         m_lasterror = wxStream_EOF;
 
     if (m_file->Eof())
         m_lasterror = wxStream_EOF;

-    if (ret == wxInvalidOffset) 
+    if (ret == wxInvalidOffset)

     {
         m_lasterror = wxStream_READ_ERR;
         ret = 0;
     {
         m_lasterror = wxStream_READ_ERR;
         ret = 0;


@@ -260,7 +263,7 @@ wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
 {
     m_file = new wxFFile(fileName, "w+b");
     m_file_destroy = TRUE;
 {
     m_file = new wxFFile(fileName, "w+b");
     m_file_destroy = TRUE;

-    
+

     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;
     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;


@@ -293,7 +296,7 @@ wxFFileOutputStream::wxFFileOutputStream(FILE *file)
 
 wxFFileOutputStream::~wxFFileOutputStream()
 {
 
 wxFFileOutputStream::~wxFFileOutputStream()
 {

-    if (m_file_destroy) 
+    if (m_file_destroy)

     {
         Sync();
         delete m_file;
     {
         Sync();
         delete m_file;