X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0378c28b877a68d8ef9991ce4b1433b2560d928..642067e02a202feddc97255f1229e4e7378541d9:/src/common/sckstrm.cpp?ds=inline diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp index ebb6441a11..bc56194375 100644 --- a/src/common/sckstrm.cpp +++ b/src/common/sckstrm.cpp @@ -44,17 +44,11 @@ wxSocketOutputStream::~wxSocketOutputStream() size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size) { - size_t ret; + size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount(); - ret = m_o_socket->Write((const char *)buffer, size).LastCount(); - - if (ret > 0) - m_lasterror = wxStream_NOERROR; - else - m_lasterror = wxStream_READ_ERR; + m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR; return ret; - } // --------------------------------------------------------------------------- @@ -72,14 +66,9 @@ wxSocketInputStream::~wxSocketInputStream() size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size) { - size_t ret; - - ret = m_i_socket->Read((char *)buffer, size).LastCount(); + size_t ret = m_i_socket->Read((char *)buffer, size).LastCount(); - if (ret > 0) - m_lasterror = wxStream_NOERROR; - else - m_lasterror = wxStream_READ_ERR; + m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR; return ret; }