/////////////////////////////////////////////////////////////////////////////
-// Name: sckstrm.h
+// Name: src/common/sckstrm.cpp
// Purpose: wxSocket*Stream
// Author: Guilhem Lavaux
// Modified by:
// Created: 17/07/97
-// RCS-ID: $Id$
// 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
size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
{
- size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount();
-
- m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
-
- 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;
}
// ---------------------------------------------------------------------------
size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
{
- size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
-
- m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
-
- 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;
}
// ---------------------------------------------------------------------------
{
}
-#endif
- // wxUSE_STREAMS && wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_SOCKETS