X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c235f09145972d2f7f7f86f2c7223f7df428eea..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/common/sckstrm.cpp?ds=sidebyside diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp index 1e1417c416..f060b3fd1f 100644 --- a/src/common/sckstrm.cpp +++ b/src/common/sckstrm.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sckstrm.h +// Name: src/common/sckstrm.cpp // Purpose: wxSocket*Stream // Author: Guilhem Lavaux // Modified by: @@ -8,26 +8,23 @@ // Copyright: (c) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "sckstrm.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_SOCKETS && wxUSE_STREAMS + +#include "wx/sckstrm.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" + #include "wx/stream.h" #endif -#if wxUSE_SOCKETS && wxUSE_STREAMS - -#include "wx/stream.h" #include "wx/socket.h" -#include "wx/sckstrm.h" // --------------------------------------------------------------------------- // wxSocketOutputStream @@ -44,17 +41,12 @@ wxSocketOutputStream::~wxSocketOutputStream() size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size) { - size_t ret; - - ret = m_o_socket->Write((const char *)buffer, size).LastCount(); - - if (m_o_socket->Error()) - m_lasterror = wxStream_WRITE_ERR; - else - m_lasterror = wxStream_NOERROR; - - return ret; - + const size_t ret = m_o_socket->Write(buffer, size).LastCount(); + m_lasterror = m_o_socket->Error() + ? m_o_socket->IsClosed() ? wxSTREAM_EOF + : wxSTREAM_WRITE_ERROR + : wxSTREAM_NO_ERROR; + return ret; } // --------------------------------------------------------------------------- @@ -72,16 +64,12 @@ wxSocketInputStream::~wxSocketInputStream() size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size) { - size_t ret; - - ret = m_i_socket->Read((char *)buffer, size).LastCount(); - - if (m_i_socket->Error()) - m_lasterror = wxStream_READ_ERR; - else - m_lasterror = wxStream_NOERROR; - - return ret; + const size_t ret = m_i_socket->Read(buffer, size).LastCount(); + m_lasterror = m_i_socket->Error() + ? m_i_socket->IsClosed() ? wxSTREAM_EOF + : wxSTREAM_READ_ERROR + : wxSTREAM_NO_ERROR; + return ret; } // --------------------------------------------------------------------------- @@ -97,5 +85,4 @@ wxSocketStream::~wxSocketStream() { } -#endif - // wxUSE_STREAMS && wxUSE_SOCKETS +#endif // wxUSE_STREAMS && wxUSE_SOCKETS