Doc tweaks

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index a1f66f76b9e2d696a9209cffad932a07b604d62e..9d15b4f9b65d501e7dd71a5bce998b04666b42fa 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -20,12 +20,14 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_STREAMS && wxUSE_FILE
+#if wxUSE_STREAMS

 
 #include <stdio.h>
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 
 
 #include <stdio.h>
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 

+#if wxUSE_FILE
+

 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------


@@ -62,17 +64,17 @@ wxFileInputStream::~wxFileInputStream()
         delete m_file;
 }
 
         delete m_file;
 }
 

-size_t wxFileInputStream::GetSize() const
+wxFileOffset wxFileInputStream::GetLength() const

 {
     return m_file->Length();
 }
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {
 {
     return m_file->Length();
 }
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {

-    off_t ret = m_file->Read(buffer, size);
+    ssize_t ret = m_file->Read(buffer, size);

 
     // NB: we can't use a switch here because HP-UX CC doesn't allow
 
     // 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)
+    //     switching over long long (which size_t is in 64bit mode)

 
     if ( !ret )
     {
 
     if ( !ret )
     {


@@ -93,12 +95,12 @@ size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
     return ret;
 }
 
     return ret;
 }
 

-off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
     return m_file->Seek(pos, mode);
 }
 
 {
     return m_file->Seek(pos, mode);
 }
 

-off_t wxFileInputStream::OnSysTell() const
+wxFileOffset wxFileInputStream::OnSysTell() const

 {
     return m_file->Tell();
 }
 {
     return m_file->Tell();
 }


@@ -160,12 +162,12 @@ size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
     return ret;
 }
 
     return ret;
 }
 

-off_t wxFileOutputStream::OnSysTell() const
+wxFileOffset wxFileOutputStream::OnSysTell() const

 {
     return m_file->Tell();
 }
 
 {
     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);
 }
 {
     return m_file->Seek(pos, mode);
 }


@@ -176,11 +178,38 @@ void wxFileOutputStream::Sync()
     m_file->Flush();
 }
 
     m_file->Flush();
 }
 

-size_t wxFileOutputStream::GetSize() const
+wxFileOffset wxFileOutputStream::GetLength() const

 {
     return m_file->Length();
 }
 
 {
     return m_file->Length();
 }
 

+// ----------------------------------------------------------------------------
+// wxTempFileOutputStream
+// ----------------------------------------------------------------------------
+
+wxTempFileOutputStream::wxTempFileOutputStream(const wxString& fileName)
+{
+    m_file = new wxTempFile(fileName);
+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+}
+
+wxTempFileOutputStream::~wxTempFileOutputStream()
+{
+    if (m_file->IsOpened())
+        Discard();
+    delete m_file;
+}
+
+size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    if (IsOk() && m_file->Write(buffer, size))
+        return size;
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+    return 0;
+}
+

 // ----------------------------------------------------------------------------
 // wxFileStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileStream
 // ----------------------------------------------------------------------------


@@ -191,22 +220,27 @@ wxFileStream::wxFileStream(const wxString& fileName)
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 

+#endif //wxUSE_FILE
+
+#if wxUSE_FFILE
+

 // ----------------------------------------------------------------------------
 // wxFFileInputStream
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxFFileInputStream
 // ----------------------------------------------------------------------------
 

-wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
-  : wxInputStream()
+wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
+                                       const wxChar *mode)
+                  : wxInputStream()

 {
 {

-    m_file = new wxFFile(fileName, _T("rb"));
+    m_file = new wxFFile(fileName, mode);

     m_file_destroy = true;
 }
 
 wxFFileInputStream::wxFFileInputStream()
     m_file_destroy = true;
 }
 
 wxFFileInputStream::wxFFileInputStream()

-  : wxInputStream()
+                  : wxInputStream()

 {
 {

-    m_file_destroy = false;

     m_file = NULL;
     m_file = NULL;

+    m_file_destroy = false;

 }
 
 wxFFileInputStream::wxFFileInputStream(wxFFile& file)
 }
 
 wxFFileInputStream::wxFFileInputStream(wxFFile& file)


@@ -227,18 +261,17 @@ wxFFileInputStream::~wxFFileInputStream()
         delete m_file;
 }
 
         delete m_file;
 }
 

-size_t wxFFileInputStream::GetSize() const
+wxFileOffset wxFFileInputStream::GetLength() const

 {
     return m_file->Length();
 }
 
 size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 {
 {
     return m_file->Length();
 }
 
 size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 {

-    off_t ret;
+    ssize_t ret = m_file->Read(buffer, size);

 
 

-    ret = m_file->Read(buffer, size);
-
-    if (m_file->Eof())
+    // It is not safe to call Eof() if the file is not opened.
+    if (!m_file->IsOpened() || m_file->Eof())

         m_lasterror = wxSTREAM_EOF;
     if (ret == wxInvalidOffset)
     {
         m_lasterror = wxSTREAM_EOF;
     if (ret == wxInvalidOffset)
     {


@@ -249,18 +282,12 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
     return ret;
 }
 
     return ret;
 }
 

-off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
 {

-#ifdef __VMS
-#pragma message disable intsignchange
-#endif
-   return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
-#ifdef __VMS
-#pragma message enable intsignchange
-#endif
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;

 }
 
 }
 

-off_t wxFFileInputStream::OnSysTell() const
+wxFileOffset wxFFileInputStream::OnSysTell() const

 {
     return m_file->Tell();
 }
 {
     return m_file->Tell();
 }


@@ -269,9 +296,10 @@ off_t wxFFileInputStream::OnSysTell() const
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------
 
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------
 

-wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
+wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,
+                                         const wxChar *mode)

 {
 {

-    m_file = new wxFFile(fileName, _T("w+b"));
+    m_file = new wxFFile(fileName, mode);

     m_file_destroy = true;
 
     if (!m_file->IsOpened())
     m_file_destroy = true;
 
     if (!m_file->IsOpened())


@@ -292,10 +320,10 @@ wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
 }
 
 wxFFileOutputStream::wxFFileOutputStream()
 }
 
 wxFFileOutputStream::wxFFileOutputStream()

-  : wxOutputStream()
+                   : wxOutputStream()

 {
 {

-    m_file_destroy = false;

     m_file = NULL;
     m_file = NULL;

+    m_file_destroy = false;

 }
 
 wxFFileOutputStream::wxFFileOutputStream(FILE *file)
 }
 
 wxFFileOutputStream::wxFFileOutputStream(FILE *file)


@@ -316,27 +344,22 @@ wxFFileOutputStream::~wxFFileOutputStream()
 size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);
 size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);

-    if (m_file->Error())
+    // It is not safe to call Error() if the file is not opened.
+    if (!m_file->IsOpened() || m_file->Error())

         m_lasterror = wxSTREAM_WRITE_ERROR;
     else
         m_lasterror = wxSTREAM_NO_ERROR;
     return ret;
 }
 
         m_lasterror = wxSTREAM_WRITE_ERROR;
     else
         m_lasterror = wxSTREAM_NO_ERROR;
     return ret;
 }
 

-off_t wxFFileOutputStream::OnSysTell() const
+wxFileOffset wxFFileOutputStream::OnSysTell() const

 {
     return m_file->Tell();
 }
 
 {
     return m_file->Tell();
 }
 

-off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
 {

-#ifdef __VMS
-#pragma message disable intsignchange
-#endif
-    return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
-#ifdef __VMS
-#pragma message enable intsignchange
-#endif
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;

 }
 
 void wxFFileOutputStream::Sync()
 }
 
 void wxFFileOutputStream::Sync()


@@ -345,7 +368,7 @@ void wxFFileOutputStream::Sync()
     m_file->Flush();
 }
 
     m_file->Flush();
 }
 

-size_t wxFFileOutputStream::GetSize() const
+wxFileOffset wxFFileOutputStream::GetLength() const

 {
     return m_file->Length();
 }
 {
     return m_file->Length();
 }


@@ -360,6 +383,7 @@ wxFFileStream::wxFFileStream(const wxString& fileName)
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 

-#endif
-  // wxUSE_STREAMS && wxUSE_FILE
+#endif //wxUSE_FFILE
+
+#endif // wxUSE_STREAMS