simplify code so it always returns the same object

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 02a15cb2ca492cdc1eea6882b070c05db644d315..e553b2c8335684745e81cfc636f69073b79fce4f 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -204,17 +204,17 @@ bool wxFile::Create(const wxString& fileName, bool bOverwrite, int accessMode)
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists

-    int fd = wxOpen( fileName,
+    int fildes = wxOpen( fileName,

                      O_BINARY | O_WRONLY | O_CREAT |
                      (bOverwrite ? O_TRUNC : O_EXCL),
                      accessMode );
                      O_BINARY | O_WRONLY | O_CREAT |
                      (bOverwrite ? O_TRUNC : O_EXCL),
                      accessMode );

-    if ( CheckForError(fd) )
+    if ( CheckForError(fildes) )

     {
         wxLogSysError(_("can't create file '%s'"), fileName);
         return false;
     }
 
     {
         wxLogSysError(_("can't create file '%s'"), fileName);
         return false;
     }
 

-    Attach(fd);
+    Attach(fildes);

     return true;
 }
 
     return true;
 }
 


@@ -258,15 +258,15 @@ bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode)
     accessMode &= wxS_IRUSR | wxS_IWUSR;
 #endif // __WINDOWS__
 
     accessMode &= wxS_IRUSR | wxS_IWUSR;
 #endif // __WINDOWS__
 

-    int fd = wxOpen( fileName, flags, accessMode);
+    int fildes = wxOpen( fileName, flags, accessMode);

 
 

-    if ( CheckForError(fd) )
+    if ( CheckForError(fildes) )

     {
         wxLogSysError(_("can't open file '%s'"), fileName);
         return false;
     }
 
     {
         wxLogSysError(_("can't open file '%s'"), fileName);
         return false;
     }
 

-    Attach(fd);
+    Attach(fildes);

     return true;
 }
 
     return true;
 }
 


@@ -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 read = Read(p, length > READSIZE ? READSIZE : length);
-        if ( read == wxInvalidOffset )
+        ssize_t nread = Read(p, length > READSIZE ? READSIZE : length);
+        if ( nread == wxInvalidOffset )

             return false;
 
             return false;
 

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

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