made Tell/Seek/Length() return wxFileSize_t as well

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

diff --git a/include/wx/file.h b/include/wx/file.h
index e4ed0193f2700ddc7a1bff6083493aae7f51dc5c..b767d0a4a09c4ead4b5a6e5e0f4d3ad92b5ec674 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -110,13 +110,13 @@ public:
 
   // file pointer operations (return ofsInvalid on failure)
     // move ptr ofs bytes related to start/current off_t/end of file
-  wxFileOffset Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart);
+  wxFileSize_t Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart);
     // move ptr to ofs bytes before the end
-  wxFileOffset SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); }
+  wxFileSize_t SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); }
     // get current off_t
-  wxFileOffset Tell() const;
+  wxFileSize_t Tell() const;
     // get current file length
-  wxFileOffset Length() const;
+  wxFileSize_t Length() const;
 
   // simple accessors
     // is file opened?

diff --git a/src/common/file.cpp b/src/common/file.cpp
index d4f8309c9e709472b68f4fa15f1c40f08a3842e0..60e204f0a23ca62faecafe723a3d193d5a00214f 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -302,14 +302,14 @@ wxFileSize_t wxFile::Read(void *pBuf, wxFileSize_t nCount)
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
-    wxFileOffset iRc = wxRead(m_fd, pBuf, nCount);
+    wxFileSize_t iRc = wxRead(m_fd, pBuf, nCount);
 
-    if ( iRc == -1 ) {
+    if ( iRc == wxInvalidOffset )
+    {
         wxLogSysError(_("can't read from file descriptor %d"), m_fd);
-        return wxInvalidOffset;
     }
-    else
-        return (wxFileSize_t)iRc;
+
+    return iRc;
 }
 
 // write
@@ -317,15 +317,16 @@ wxFileSize_t wxFile::Write(const void *pBuf, wxFileSize_t nCount)
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
-    int iRc = wxWrite(m_fd, pBuf, nCount);
+    wxFileSize_t iRc = wxWrite(m_fd, pBuf, nCount);
 
-    if ( iRc == -1 ) {
+    if ( iRc == wxInvalidOffset )
+    {
         wxLogSysError(_("can't write to file descriptor %d"), m_fd);
         m_error = true;
-        return 0;
+        iRc = 0;
     }
-    else
-        return (wxFileSize_t)iRc;
+
+    return (wxFileSize_t)iRc;
 }
 
 // flush
@@ -351,7 +352,7 @@ bool wxFile::Flush()
 // ----------------------------------------------------------------------------
 
 // seek
-wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
+wxFileSize_t wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
 {
     wxASSERT( IsOpened() );
 
@@ -373,60 +374,60 @@ wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
             break;
     }
 
-    if (ofs == wxInvalidOffset)
+    if (ofs == (wxFileOffset) wxInvalidOffset)
     {
         wxLogSysError(_("can't seek on file descriptor %d, large files support is not enabled."), m_fd);
         return wxInvalidOffset;
     }
-    wxFileOffset iRc = wxSeek(m_fd, ofs, origin);
-    if ( iRc == -1 ) {
+    wxFileSize_t iRc = wxSeek(m_fd, ofs, origin);
+    if ( iRc == wxInvalidOffset )
+    {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
-        return wxInvalidOffset;
     }
-    else
-        return iRc;
+
+    return iRc;
 }
 
-// get current wxFileOffset
-wxFileOffset wxFile::Tell() const
+// get current file offset
+wxFileSize_t wxFile::Tell() const
 {
     wxASSERT( IsOpened() );
 
-    wxFileOffset iRc = wxTell(m_fd);
-    if ( iRc == -1 ) {
+    wxFileSize_t iRc = wxTell(m_fd);
+    if ( iRc == wxInvalidOffset )
+    {
         wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
-        return wxInvalidOffset;
     }
-    else
-        return iRc;
+
+    return iRc;
 }
 
 // get current file length
-wxFileOffset wxFile::Length() const
+wxFileSize_t wxFile::Length() const
 {
     wxASSERT( IsOpened() );
 
-    wxFileOffset iRc = Tell();
-    if ( iRc != -1 ) {
-        // @ have to use const_cast :-(
-        wxFileOffset iLen = ((wxFile *)this)->SeekEnd();
-        if ( iLen != -1 ) {
+    wxFileSize_t iRc = Tell();
+    if ( iRc != wxInvalidOffset ) {
+        // have to use const_cast :-(
+        wxFileSize_t iLen = ((wxFile *)this)->SeekEnd();
+        if ( iLen != wxInvalidOffset ) {
             // restore old position
-            if ( ((wxFile *)this)->Seek(iRc) == -1 ) {
+            if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) {
                 // error
-                iLen = -1;
+                iLen = wxInvalidOffset;
             }
         }
 
         iRc = iLen;
     }
 
-    if ( iRc == -1 ) {
+    if ( iRc == wxInvalidOffset )
+    {
         wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
-        return wxInvalidOffset;
     }
-    else
-        return iRc;
+
+    return iRc;
 }
 
 // is end of file reached?
@@ -434,14 +435,14 @@ bool wxFile::Eof() const
 {
     wxASSERT( IsOpened() );
 
-    int iRc;
+    wxFileSize_t iRc;
 
 #if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
     // @@ this doesn't work, of course, on unseekable file descriptors
-    wxFileOffset ofsCur = Tell(),
+    wxFileSize_t ofsCur = Tell(),
     ofsMax = Length();
     if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
-        iRc = -1;
+        iRc = wxInvalidOffset;
     else
         iRc = ofsCur == ofsMax;
 #else  // Windows and "native" compiler
@@ -455,7 +456,7 @@ bool wxFile::Eof() const
         case 0:
             return false;
 
-        case -1:
+        case wxInvalidOffset:
             wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
                 break;