Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/sckstrm.cpp
View File

@@ -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 (m_o_socket->Error())
m_lasterror = wxStream_WRITE_ERR;
else
m_lasterror = wxStream_NOERROR;
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;
size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
ret = m_i_socket->Read((char *)buffer, size).LastCount();
if (m_i_socket->Error())
m_lasterror = wxStream_READ_ERR;
else
m_lasterror = wxStream_NOERROR;
m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
return ret;
}