Fixes for GNUPro 00r1

[wxWidgets.git] / src / common / sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index df9392287032f0045abcff4d706f728e33f3ffdd..1e1417c416d411155459f7b0890279031ba968c5 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -47,14 +47,12 @@ size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
   size_t ret;
 
   ret = m_o_socket->Write((const char *)buffer, size).LastCount();
   size_t ret;
 
   ret = m_o_socket->Write((const char *)buffer, size).LastCount();

-  switch (m_o_socket->LastError()) {
-  case GSOCK_NOERROR:
+
+  if (m_o_socket->Error())
+    m_lasterror = wxStream_WRITE_ERR;
+  else

     m_lasterror = wxStream_NOERROR;
     m_lasterror = wxStream_NOERROR;

-    break;
-  default:
-    m_lasterror = wxStream_READ_ERR;
-    break;
-  }
+

   return ret;
 
 }
   return ret;
 
 }


@@ -77,14 +75,12 @@ size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
   size_t ret;
 
   ret = m_i_socket->Read((char *)buffer, size).LastCount();
   size_t ret;
 
   ret = m_i_socket->Read((char *)buffer, size).LastCount();

-  switch (m_i_socket->LastError()) {
-  case GSOCK_NOERROR:
+
+  if (m_i_socket->Error())
+    m_lasterror = wxStream_READ_ERR;
+  else

     m_lasterror = wxStream_NOERROR;
     m_lasterror = wxStream_NOERROR;

-    break;
-  default:
-    m_lasterror = wxStream_WRITE_ERR;
-    break;
-  }
+

   return ret;
 }
 
   return ret;
 }