fix another memory leak in SetCommand() (coverity checker CID 52)

[wxWidgets.git] / src / motif / gsockmot.cpp

diff --git a/src/motif/gsockmot.cpp b/src/motif/gsockmot.cpp
index 7d8dbf7e9964438d6cb53523967cf8a342404a02..ef711c8c3e97ceef88883cd776fbbd3f169569b7 100644 (file)
--- a/src/motif/gsockmot.cpp
+++ b/src/motif/gsockmot.cpp
@@ -1,122 +1,142 @@
-// -------------------------------------------------------------------------
+/////////////////////////////////////////////////////////////////////////////
+// Name:    src/motif/gsockmot.cpp
 // Project: GSocket (Generic Socket) for WX
-// Name:    gsockmot.cpp
 // Purpose: GSocket: Motif part
 // CVSID:   $Id$
-// -------------------------------------------------------------------------
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
 
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_SOCKETS
 
 #include <stdlib.h>
 #include <X11/Intrinsic.h>
-#include <wx/gsocket.h>
-#include <wx/app.h>
-#include <wx/unix/gsockunx.h>
+#include "wx/gsocket.h"
+#include "wx/unix/gsockunx.h"
 
-#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
+extern "C" XtAppContext wxGetAppContext();
 
-static void _GSocket_Motif_Input(XtPointer data, int *fid,
-                                 XtInputId *id)
+static void _GSocket_Motif_Input(XtPointer data, int *WXUNUSED(fid),
+                                 XtInputId *WXUNUSED(id))
 {
-  GSocket *socket = (GSocket *)data;
+    GSocket *socket = (GSocket *)data;
 
-  _GSocket_Detected_Read(socket);
+    socket->Detected_Read();
 }
 
-static void _GSocket_Motif_Output(XtPointer data, int *fid,
-                                  XtInputId *id)
+static void _GSocket_Motif_Output(XtPointer data, int *WXUNUSED(fid),
+                                  XtInputId *WXUNUSED(id))
 {
-  GSocket *socket = (GSocket *)data;
+    GSocket *socket = (GSocket *)data;
 
-  _GSocket_Detected_Write(socket);
+    socket->Detected_Write();
 }
 
-void _GSocket_GUI_Init(GSocket *socket)
+bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
 {
-  int i;
-  int *m_id;
+    return true;
+}
 
-  socket->m_gui_dependent = (char *)malloc(sizeof(int)*3);
-  m_id = (int *)(socket->m_gui_dependent);
+bool GSocketGUIFunctionsTableConcrete::OnInit(void)
+{
+    return 1;
+}
 
-  for (i=0;i<3;i++)
-    m_id[i] = -1;
+void GSocketGUIFunctionsTableConcrete::OnExit(void)
+{
 }
 
-void _GSocket_GUI_Destroy(GSocket *socket)
+bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
 {
-  int i;
-  int *m_id;
+    int *m_id;
 
-  m_id = (int *)(socket->m_gui_dependent);
+    socket->m_gui_dependent = (char *)malloc(sizeof(int)*2);
+    m_id = (int *)(socket->m_gui_dependent);
 
-  for (i=0;i<3;i++)
-    if (m_id[i] == -1)
-      XtRemoveInput(m_id[i]);
+    m_id[0] = -1;
+    m_id[1] = -1;
 
-  free(socket->m_gui_dependent);
+    return true;
 }
 
-void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
+void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)
 {
-  int *m_id;
-
-  m_id = (int *)(socket->m_gui_dependent);
-
-  switch (event) {
-  case GSOCK_CONNECTION:
-  case GSOCK_LOST:
-  case GSOCK_INPUT: 
-     if (m_id[0] != -1)
-       XtRemoveInput(m_id[0]);
-     m_id[0] = XtAppAddInput(wxAPP_CONTEXT, socket->m_fd,
-                             (XtPointer *)XtInputReadMask,
-                             (XtInputCallbackProc) _GSocket_Motif_Input,
-                             (XtPointer) socket);
-     break;
-  case GSOCK_OUTPUT:
-     if (m_id[1] != -1)
-       XtRemoveInput(m_id[1]);
-     m_id[1] = XtAppAddInput(wxAPP_CONTEXT, socket->m_fd,
-                             (XtPointer *)XtInputWriteMask,
-                             (XtInputCallbackProc) _GSocket_Motif_Output,
-                             (XtPointer) socket);
-     break;
-  default: return;
-  }
+    free(socket->m_gui_dependent);
 }
 
-void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
+void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event)
 {
-  int c;
-  int *m_id;
-
-  m_id = (int *)(socket->m_gui_dependent);
-
-  switch (event) {
-  case GSOCK_CONNECTION: 
-  case GSOCK_LOST:
-  case GSOCK_INPUT: c = 0; break;
-  case GSOCK_OUTPUT: c = 1; break;
-     break;
-  default: return;
-  }
-
-  if (m_id[c] != -1)
-    XtRemoveInput(m_id[c]);
+    int *m_id = (int *)(socket->m_gui_dependent);
+    int c;
+
+    if (socket->m_fd == -1)
+        return;
+
+    switch (event)
+    {
+        case GSOCK_LOST:       /* fall-through */
+        case GSOCK_INPUT:      c = 0; break;
+        case GSOCK_OUTPUT:     c = 1; break;
+        case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
+        default: return;
+    }
+
+    if (m_id[c] != -1)
+        XtRemoveInput(m_id[c]);
+
+    if (c == 0)
+    {
+        m_id[0] = XtAppAddInput(wxGetAppContext(), socket->m_fd,
+                                (XtPointer *)XtInputReadMask,
+                                (XtInputCallbackProc) _GSocket_Motif_Input,
+                                (XtPointer) socket);
+    }
+    else
+    {
+        m_id[1] = XtAppAddInput(wxGetAppContext(), socket->m_fd,
+                                (XtPointer *)XtInputWriteMask,
+                                (XtInputCallbackProc) _GSocket_Motif_Output,
+                                (XtPointer) socket);
+    }
+}
 
-  m_id[c] = -1;
+void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event)
+{
+    int *m_id = (int *)(socket->m_gui_dependent);
+    int c;
+
+    switch (event)
+    {
+        case GSOCK_LOST:       /* fall-through */
+        case GSOCK_INPUT:      c = 0; break;
+        case GSOCK_OUTPUT:     c = 1; break;
+        case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
+        default: return;
+    }
+
+    if (m_id[c] != -1)
+        XtRemoveInput(m_id[c]);
+
+    m_id[c] = -1;
 }
 
-unsigned long GSocket_GetEventID(GSocket *socket)
+void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
 {
-  return 0;
+    Install_Callback(socket, GSOCK_INPUT);
+    Install_Callback(socket, GSOCK_OUTPUT);
 }
 
-void GSocket_DoEvent(unsigned long evt_id)
+void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
 {
+    Uninstall_Callback(socket, GSOCK_INPUT);
+    Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 
-#endif // wxUSE_SOCKETS
+#else /* !wxUSE_SOCKETS */
+
+/* some compilers don't like having empty source files */
+static int wxDummyGsockVar = 0;
+
+#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */