vc6 did not like this (void function returning a value)

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

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 5dbcec46cd366800e6210cbd13ec76c69285df69..350b824257a15661a6c035c581d1b310ada7bd0d 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sckipc.cpp
+// Name:        src/common/sckipc.cpp

 // Purpose:     Interprocess communication implementation (wxSocket version)
 // Author:      Julian Smart
 // Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
 // Purpose:     Interprocess communication implementation (wxSocket version)
 // Author:      Julian Smart
 // Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998


@@ -22,31 +22,28 @@
 // headers
 // --------------------------------------------------------------------------
 
 // headers
 // --------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "sckipc.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_IPC && wxUSE_STREAMS
+
+#include "wx/sckipc.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/log.h"
+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#if wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS
-

 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 
 #include "wx/socket.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 
 #include "wx/socket.h"

-#include "wx/sckipc.h"
-#include "wx/module.h"
-#include "wx/event.h"

 
 // --------------------------------------------------------------------------
 // macros and constants
 
 // --------------------------------------------------------------------------
 // macros and constants


@@ -89,7 +86,7 @@ static wxSockAddress *
 GetAddressFromName(const wxString& serverName, const wxString& host = wxEmptyString)
 {
     // we always use INET sockets under non-Unix systems
 GetAddressFromName(const wxString& serverName, const wxString& host = wxEmptyString)
 {
     // we always use INET sockets under non-Unix systems

-#if defined(__UNIX__) && !defined(__WXMAC__) && !defined(__WINE__)
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))

     // under Unix, if the server name looks like a path, create a AF_UNIX
     // socket instead of AF_INET one
     if ( serverName.Find(_T('/')) != wxNOT_FOUND )
     // under Unix, if the server name looks like a path, create a AF_UNIX
     // socket instead of AF_INET one
     if ( serverName.Find(_T('/')) != wxNOT_FOUND )


@@ -167,15 +164,15 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
                                                const wxString& serverName,
                                                const wxString& topic)
 {
                                                const wxString& serverName,
                                                const wxString& topic)
 {

+  wxSockAddress *addr = GetAddressFromName(serverName, host);
+  if ( !addr )
+      return NULL;
+

   wxSocketClient *client = new wxSocketClient(SCKIPC_FLAGS);
   wxSocketStream *stream = new wxSocketStream(*client);
   wxDataInputStream *data_is = new wxDataInputStream(*stream);
   wxDataOutputStream *data_os = new wxDataOutputStream(*stream);
 
   wxSocketClient *client = new wxSocketClient(SCKIPC_FLAGS);
   wxSocketStream *stream = new wxSocketStream(*client);
   wxDataInputStream *data_is = new wxDataInputStream(*stream);
   wxDataOutputStream *data_os = new wxDataOutputStream(*stream);
 

-  wxSockAddress *addr = GetAddressFromName(serverName, host);
-  if ( !addr )
-      return NULL;
-

   bool ok = client->Connect(*addr);
   delete addr;
 
   bool ok = client->Connect(*addr);
   delete addr;
 


@@ -359,15 +356,17 @@ wxTCPConnection::wxTCPConnection(wxChar *buffer, int size)
 wxTCPConnection::~wxTCPConnection ()
 {
   Disconnect();
 wxTCPConnection::~wxTCPConnection ()
 {
   Disconnect();

-  wxDELETE(m_codeci);
-  wxDELETE(m_codeco);
-  wxDELETE(m_sockstrm);

 
   if (m_sock)
   {
     m_sock->SetClientData(NULL);
     m_sock->Destroy();
   }
 
   if (m_sock)
   {
     m_sock->SetClientData(NULL);
     m_sock->Destroy();
   }

+
+  /* Delete after destroy */
+  wxDELETE(m_codeci);
+  wxDELETE(m_codeco);
+  wxDELETE(m_sockstrm);

 }
 
 void wxTCPConnection::Compress(bool WXUNUSED(on))
 }
 
 void wxTCPConnection::Compress(bool WXUNUSED(on))


@@ -382,8 +381,13 @@ bool wxTCPConnection::Disconnect ()
       return true;
   // Send the the disconnect message to the peer.
   m_codeco->Write8(IPC_DISCONNECT);
       return true;
   // Send the the disconnect message to the peer.
   m_codeco->Write8(IPC_DISCONNECT);

-  m_sock->Notify(false);
-  m_sock->Close();
+
+  if ( m_sock )
+  {
+      m_sock->Notify(false);
+      m_sock->Close();
+  }
+

   SetConnected(false);
 
   return true;
   SetConnected(false);
 
   return true;


@@ -399,7 +403,7 @@ bool wxTCPConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
   m_codeco->Write8(format);
 
   if (size < 0)
   m_codeco->Write8(format);
 
   if (size < 0)

-    size = wxStrlen(data) + 1;    // includes final NUL
+    size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL

 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);


@@ -427,6 +431,7 @@ wxChar *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat f
     size_t s;
 
     s = m_codeci->Read32();
     size_t s;
 
     s = m_codeci->Read32();

+

     wxChar *data = GetBufferAtLeast( s );
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxTCPConnection::Request") );
     wxChar *data = GetBufferAtLeast( s );
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxTCPConnection::Request") );


@@ -438,7 +443,7 @@ wxChar *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat f
   }
 }
 
   }
 }
 

-bool wxTCPConnection::Poke (const wxString& item, wxChar *data, int size, wxIPCFormat format)
+bool wxTCPConnection::Poke (const wxString& item, const wxChar *data, int size, wxIPCFormat format)

 {
   if (!m_sock->IsConnected())
     return false;
 {
   if (!m_sock->IsConnected())
     return false;


@@ -448,7 +453,7 @@ bool wxTCPConnection::Poke (const wxString& item, wxChar *data, int size, wxIPCF
   m_codeco->Write8(format);
 
   if (size < 0)
   m_codeco->Write8(format);
 
   if (size < 0)

-    size = wxStrlen(data) + 1;    // includes final NUL
+    size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL

 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);


@@ -494,7 +499,7 @@ bool wxTCPConnection::StopAdvise (const wxString& item)
 
 // Calls that SERVER can make
 bool wxTCPConnection::Advise (const wxString& item,
 
 // Calls that SERVER can make
 bool wxTCPConnection::Advise (const wxString& item,

-                              wxChar *data, int size, wxIPCFormat format)
+                              const wxChar *data, int size, wxIPCFormat format)

 {
   if (!m_sock->IsConnected())
     return false;
 {
   if (!m_sock->IsConnected())
     return false;


@@ -504,7 +509,7 @@ bool wxTCPConnection::Advise (const wxString& item,
   m_codeco->Write8(format);
 
   if (size < 0)
   m_codeco->Write8(format);
 
   if (size < 0)

-    size = wxStrlen(data) + 1;    // includes final NUL
+    size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL

 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);


@@ -524,6 +529,9 @@ END_EVENT_TABLE()
 void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 {
   wxSocketBase *sock = event.GetSocket();
 void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 {
   wxSocketBase *sock = event.GetSocket();

+  if (!sock) {         /* No socket, no glory */
+    return ;
+  }

   wxSocketNotify evt = event.GetSocketEvent();
   wxTCPConnection *connection = (wxTCPConnection *)(sock->GetClientData());
 
   wxSocketNotify evt = event.GetSocketEvent();
   wxTCPConnection *connection = (wxTCPConnection *)(sock->GetClientData());
 


@@ -562,6 +570,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
 
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();

+    

     data = connection->GetBufferAtLeast( size );
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxTCPEventHandler::Client_OnRequest") );
     data = connection->GetBufferAtLeast( size );
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxTCPEventHandler::Client_OnRequest") );


@@ -639,14 +648,14 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
     format = (wxIPCFormat)codeci->Read8();
 
     int user_size = -1;
     format = (wxIPCFormat)codeci->Read8();
 
     int user_size = -1;

-    wxChar *user_data = connection->OnRequest (topic_name, item, &user_size, format);
+    const wxChar *user_data = connection->OnRequest (topic_name, item, &user_size, format);

 
     if (user_data)
     {
       codeco->Write8(IPC_REQUEST_REPLY);
 
       if (user_size == -1)
 
     if (user_data)
     {
       codeco->Write8(IPC_REQUEST_REPLY);
 
       if (user_size == -1)

-        user_size = wxStrlen(user_data) + 1;      // includes final NUL
+        user_size = (wxStrlen(user_data) + 1) * sizeof(wxChar);    // includes final NUL

 
       codeco->Write32(user_size);
       sockstrm->Write(user_data, user_size);
 
       codeco->Write32(user_size);
       sockstrm->Write(user_data, user_size);


@@ -673,6 +682,9 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
 {
   wxSocketServer *server = (wxSocketServer *) event.GetSocket();
 void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
 {
   wxSocketServer *server = (wxSocketServer *) event.GetSocket();

+  if (!server) {               /* No server, Then exit */
+         return ;
+  }

   wxTCPServer *ipcserv = (wxTCPServer *) server->GetClientData();
 
   // This socket is being deleted; skip this event
   wxTCPServer *ipcserv = (wxTCPServer *) server->GetClientData();
 
   // This socket is being deleted; skip this event


@@ -684,6 +696,9 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
 
   // Accept the connection, getting a new socket
   wxSocketBase *sock = server->Accept();
 
   // Accept the connection, getting a new socket
   wxSocketBase *sock = server->Accept();

+  if (!sock) {         /* No socket, no glory */
+         return ;
+  }

   if (!sock->Ok())
   {
     sock->Destroy();
   if (!sock->Ok())
   {
     sock->Destroy();


@@ -756,4 +771,4 @@ IMPLEMENT_DYNAMIC_CLASS(wxTCPEventHandlerModule, wxModule)
 
 
 #endif
 
 
 #endif

-    // wxUSE_SOCKETS && wxUSE_IPC
+   // wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS