wxUSE_IMAGE cleanup, fix warning

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index a208dacb3ec124536650a4eb82e72f79bd796045..42a43f2cb4865b3fc93e2f1630d92768654af9fc 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -103,33 +103,28 @@ bool wxFFile::Close()
 // read/write
 // ----------------------------------------------------------------------------
 
-bool wxFFile::ReadAll(wxString *str)
+bool wxFFile::ReadAll(wxString *str, wxMBConv& conv)
 {
     wxCHECK_MSG( str, false, wxT("invalid parameter") );
     wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") );
+    wxCHECK_MSG( Length() >= 0, false, wxT("invalid length") );
+    size_t length = (size_t)Length();
+    wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
 
     clearerr(m_fp);
 
-    str->Empty();
-    str->Alloc(Length());
-
-    wxChar buf[1024];
-    static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0'
-    while ( !Eof() )
+    const size_t fileLen = Length();
+    wxCharBuffer buf(fileLen + 1);
+    if ( (fread(buf.data(), sizeof(char), fileLen, m_fp) < fileLen) || Error() ) 
     {
-        size_t nRead = fread(buf, sizeof(wxChar), nSize, m_fp);
-        if ( (nRead < nSize) && Error() )
-        {
-            wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
-
-            return false;
-        }
-        //else: just EOF
+        wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
 
-        buf[nRead] = 0;
-        *str += buf;
+        return false;
     }
 
+    buf.data()[fileLen] = 0;
+    *str = wxString(buf, conv);
+
     return true;
 }
 
@@ -206,16 +201,18 @@ bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)
             break;
     }
 
-#ifndef HAVE_FSEEKO 
+#ifndef HAVE_FSEEKO
     if ((long)ofs != ofs)
     {
         wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
 
         return false;
     }
-#endif
 
+    if ( wxFseek(m_fp, (long)ofs, origin) != 0 )
+#else
     if ( wxFseek(m_fp, ofs, origin) != 0 )
+#endif
     {
         wxLogSysError(_("Seek error on file '%s'"), m_name.c_str());
 
@@ -260,7 +257,7 @@ wxFileOffset wxFFile::Length() const
         }
     }
 
-    return wxInvalidOffset; 
+    return wxInvalidOffset;
 }
 
 #endif // wxUSE_FFILE