X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..27db4210568ff8463f38e347614f40f238c9f660:/src/common/wfstream.cpp

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 56743fd214..904a89809f 100644
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -6,10 +6,10 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "wfstream.h"
 #endif
 
@@ -34,26 +34,26 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName)
   : wxInputStream()
 {
     m_file = new wxFile(fileName, wxFile::read);
-    m_file_destroy = TRUE;
+    m_file_destroy = true;
 }
 
 wxFileInputStream::wxFileInputStream()
   : wxInputStream()
 {
-    m_file_destroy = FALSE;
+    m_file_destroy = false;
     m_file = NULL;
 }
 
 wxFileInputStream::wxFileInputStream(wxFile& file)
 {
     m_file = &file;
-    m_file_destroy = FALSE;
+    m_file_destroy = false;
 }
 
 wxFileInputStream::wxFileInputStream(int fd)
 {
     m_file = new wxFile(fd);
-    m_file_destroy = TRUE;
+    m_file_destroy = true;
 }
 
 wxFileInputStream::~wxFileInputStream()
@@ -69,32 +69,36 @@ size_t wxFileInputStream::GetSize() const
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {
-    off_t ret = m_file->Read(buffer, size);
+    wxFileOffset ret = m_file->Read(buffer, size);
 
-    switch ( ret )
-    {
-        case 0:
-            m_lasterror = wxSTREAM_EOF;
-            break;
-
-        case wxInvalidOffset:
-            m_lasterror = wxSTREAM_READ_ERROR;
-            ret = 0;
-            break;
+    // NB: we can't use a switch here because HP-UX CC doesn't allow
+    //     switching over long long (which off_t is in 64bit mode)
 
-        default:
-            m_lasterror = wxSTREAM_NO_ERROR;
+    if ( !ret )
+    {
+        // nothing read, so nothing more to read
+        m_lasterror = wxSTREAM_EOF;
+    }
+    else if ( ret == wxInvalidOffset )
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+        ret = 0;
+    }
+    else
+    {
+        // normal case
+        m_lasterror = wxSTREAM_NO_ERROR;
     }
 
     return ret;
 }
 
-off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {
     return m_file->Seek(pos, mode);
 }
 
-off_t wxFileInputStream::OnSysTell() const
+wxFileOffset wxFileInputStream::OnSysTell() const
 {
     return m_file->Tell();
 }
@@ -106,7 +110,7 @@ off_t wxFileInputStream::OnSysTell() const
 wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 {
     m_file = new wxFile(fileName, wxFile::write);
-    m_file_destroy = TRUE;
+    m_file_destroy = true;
 
     if (!m_file->IsOpened())
     {
@@ -122,20 +126,20 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 wxFileOutputStream::wxFileOutputStream(wxFile& file)
 {
     m_file = &file;
-    m_file_destroy = FALSE;
+    m_file_destroy = false;
 }
 
 wxFileOutputStream::wxFileOutputStream()
                   : wxOutputStream()
 {
-    m_file_destroy = FALSE;
+    m_file_destroy = false;
     m_file = NULL;
 }
 
 wxFileOutputStream::wxFileOutputStream(int fd)
 {
     m_file = new wxFile(fd);
-    m_file_destroy = TRUE;
+    m_file_destroy = true;
 }
 
 wxFileOutputStream::~wxFileOutputStream()
@@ -156,12 +160,12 @@ size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
     return ret;
 }
 
-off_t wxFileOutputStream::OnSysTell() const
+wxFileOffset wxFileOutputStream::OnSysTell() const
 {
     return m_file->Tell();
 }
 
-off_t wxFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {
     return m_file->Seek(pos, mode);
 }
@@ -194,27 +198,27 @@ wxFileStream::wxFileStream(const wxString& fileName)
 wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
   : wxInputStream()
 {
-    m_file = new wxFFile(fileName, "rb");
-    m_file_destroy = TRUE;
+    m_file = new wxFFile(fileName, _T("rb"));
+    m_file_destroy = true;
 }
 
 wxFFileInputStream::wxFFileInputStream()
   : wxInputStream()
 {
-    m_file_destroy = FALSE;
+    m_file_destroy = false;
     m_file = NULL;
 }
 
 wxFFileInputStream::wxFFileInputStream(wxFFile& file)
 {
     m_file = &file;
-    m_file_destroy = FALSE;
+    m_file_destroy = false;
 }
 
 wxFFileInputStream::wxFFileInputStream(FILE *file)
 {
     m_file = new wxFFile(file);
-    m_file_destroy = TRUE;
+    m_file_destroy = true;
 }
 
 wxFFileInputStream::~wxFFileInputStream()
@@ -230,7 +234,7 @@ size_t wxFFileInputStream::GetSize() const
 
 size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 {
-    off_t ret;
+    wxFileOffset ret;
 
     ret = m_file->Read(buffer, size);
 
@@ -245,12 +249,18 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
     return ret;
 }
 
-off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {
-    return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset );
+#ifdef __VMS
+#pragma message disable intsignchange
+#endif
+   return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
+#ifdef __VMS
+#pragma message enable intsignchange
+#endif
 }
 
-off_t wxFFileInputStream::OnSysTell() const
+wxFileOffset wxFFileInputStream::OnSysTell() const
 {
     return m_file->Tell();
 }
@@ -261,8 +271,8 @@ off_t wxFFileInputStream::OnSysTell() const
 
 wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
 {
-    m_file = new wxFFile(fileName, "w+b");
-    m_file_destroy = TRUE;
+    m_file = new wxFFile(fileName, _T("w+b"));
+    m_file_destroy = true;
 
     if (!m_file->IsOpened())
     {
@@ -278,20 +288,20 @@ wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
 wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
 {
     m_file = &file;
-    m_file_destroy = FALSE;
+    m_file_destroy = false;
 }
 
 wxFFileOutputStream::wxFFileOutputStream()
   : wxOutputStream()
 {
-    m_file_destroy = FALSE;
+    m_file_destroy = false;
     m_file = NULL;
 }
 
 wxFFileOutputStream::wxFFileOutputStream(FILE *file)
 {
     m_file = new wxFFile(file);
-    m_file_destroy = TRUE;
+    m_file_destroy = true;
 }
 
 wxFFileOutputStream::~wxFFileOutputStream()
@@ -313,14 +323,20 @@ size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
     return ret;
 }
 
-off_t wxFFileOutputStream::OnSysTell() const
+wxFileOffset wxFFileOutputStream::OnSysTell() const
 {
     return m_file->Tell();
 }
 
-off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {
-    return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset );
+#ifdef __VMS
+#pragma message disable intsignchange
+#endif
+    return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
+#ifdef __VMS
+#pragma message enable intsignchange
+#endif
 }
 
 void wxFFileOutputStream::Sync()