Fix minor typo in wxDV_VERT_RULES documentation.

[wxWidgets.git] / src / common / file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index b2cd1bed5f6a0ff54889792d1773bd8c6bf97f47..d6b4620e7dbb2bc319e336df30fad3fbb7c6017d 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -295,20 +295,24 @@ bool wxFile::ReadAll(wxString *str, const wxMBConv& conv)
 {
     wxCHECK_MSG( str, false, wxS("Output string must be non-NULL") );
 
 {
     wxCHECK_MSG( str, false, wxS("Output string must be non-NULL") );
 

-    size_t length = wx_truncate_cast(size_t, Length());
+    ssize_t length = Length();

     wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
 
     wxCharBuffer buf(length);
     char* p = buf.data();
     for ( ;; )
     {
     wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
 
     wxCharBuffer buf(length);
     char* p = buf.data();
     for ( ;; )
     {

-        static const unsigned READSIZE = 4096;
+        static const ssize_t READSIZE = 4096;

 
         ssize_t nread = Read(p, length > READSIZE ? READSIZE : length);
         if ( nread == wxInvalidOffset )
             return false;
 
         p += nread;
 
         ssize_t nread = Read(p, length > READSIZE ? READSIZE : length);
         if ( nread == wxInvalidOffset )
             return false;
 
         p += nread;

+        if ( length <= nread )
+            break;
+
+        length -= nread;

     }
 
     *p = 0;
     }
 
     *p = 0;


@@ -507,10 +511,6 @@ bool wxFile::Eof() const
     {
         wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
     }
     {
         wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
     }

-    else if ( iRc != 1 )
-    {
-        wxFAIL_MSG(wxT("invalid eof() return value."));
-    }

 
     return true;
 }
 
     return true;
 }