projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid an unnecessary and unused (resulting in release build warning) variable in...
[wxWidgets.git]
/
src
/
common
/
sckstrm.cpp
diff --git
a/src/common/sckstrm.cpp
b/src/common/sckstrm.cpp
index f7796cea3b7ca45f01d6952dc64696fb6855e9a8..f060b3fd1f0c3662c8e6f8effd446e785c839b71 100644
(file)
--- a/
src/common/sckstrm.cpp
+++ b/
src/common/sckstrm.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: s
ckstrm.h
+// Name: s
rc/common/sckstrm.cpp
// Purpose: wxSocket*Stream
// Author: Guilhem Lavaux
// Modified by:
// Purpose: wxSocket*Stream
// Author: Guilhem Lavaux
// Modified by:
@@
-8,26
+8,23
@@
// Copyright: (c)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// 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__
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
+
#pragma hdrstop
#endif
#endif
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+
+#include "wx/sckstrm.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
-
#include "wx/defs
.h"
+
#include "wx/stream
.h"
#endif
#endif
-#if wxUSE_SOCKETS && wxUSE_STREAMS
-
-#include "wx/stream.h"
#include "wx/socket.h"
#include "wx/socket.h"
-#include "wx/sckstrm.h"
// ---------------------------------------------------------------------------
// wxSocketOutputStream
// ---------------------------------------------------------------------------
// wxSocketOutputStream
@@
-42,15
+39,14
@@
wxSocketOutputStream::~wxSocketOutputStream()
{
}
{
}
-wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
-{
- m_lastcount = m_o_socket->Write((const char *)buffer, size).LastCount();
- return *this;
-}
-
size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
{
size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
{
- return m_o_socket->Write((const char *)buffer, size).LastCount();
+ 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;
}
// ---------------------------------------------------------------------------
}
// ---------------------------------------------------------------------------
@@
-66,15
+62,14
@@
wxSocketInputStream::~wxSocketInputStream()
{
}
{
}
-wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
-{
- m_lastcount = m_i_socket->Read((char *)buffer, size).LastCount();
- return *this;
-}
-
size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
{
size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
{
- return m_i_socket->Read((char *)buffer, size).LastCount();
+ 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;
}
// ---------------------------------------------------------------------------
}
// ---------------------------------------------------------------------------
@@
-90,5
+85,4
@@
wxSocketStream::~wxSocketStream()
{
}
{
}
-#endif
- // wxUSE_STREAMS && wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_SOCKETS