[PATCH] Remove useless callback in unix socket implementation

[Arnaud Versini (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1633

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/1633/1

Remove useless callback in unix socket implementation

Change-Id: Ibe46e2f1628f4d2e4840429703e0d5a69059a188
---
M sal/osl/unx/socket.c
M sal/osl/unx/sockimpl.h
2 files changed, 0 insertions(+), 16 deletions(-)



diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 1af9039..a9f3fc0 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -469,8 +469,6 @@
 
     pSocket->m_Socket = Socket;
     pSocket->m_nLastError = 0;
-    pSocket->m_CloseCallback = 0;
-    pSocket->m_CallbackArg = 0;
     pSocket->m_nRefCount = 1;
 
 #if defined(LINUX)
@@ -1466,10 +1464,6 @@
         {
             pSocket->m_nLastError=errno;
         }
-
-
-        pSocket->m_CloseCallback    = NULL;
-        pSocket->m_CallbackArg  = NULL;
     }
 
     return pSocket;
@@ -1559,12 +1553,6 @@
         pSocket->m_bIsAccepting = sal_False;
     }
 #endif /* LINUX */
-
-    /* registrierten Callback ausfuehren */
-    if (pSocket->m_CloseCallback != NULL)
-    {
-        pSocket->m_CloseCallback(pSocket->m_CallbackArg);
-    }
 
     nRet=close(nFD);
     if ( nRet != 0 )
@@ -1905,8 +1893,6 @@
 
     pConnectionSockImpl->m_Socket           = Connection;
     pConnectionSockImpl->m_nLastError       = 0;
-    pConnectionSockImpl->m_CloseCallback    = NULL;
-    pConnectionSockImpl->m_CallbackArg      = NULL;
 #if defined(LINUX)
     pConnectionSockImpl->m_bIsAccepting     = sal_False;
 
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h
index d2c68b6..353d915 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -33,8 +33,6 @@
 struct oslSocketImpl {
     int                 m_Socket;
     int                 m_nLastError;
-    oslCloseCallback    m_CloseCallback;
-    void*               m_CallbackArg;
     oslInterlockedCount m_nRefCount;
 #if defined(LINUX)
     sal_Bool            m_bIsAccepting;

-- 
To view, visit https://gerrit.libreoffice.org/1633
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe46e2f1628f4d2e4840429703e0d5a69059a188
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini <arnaud.versini at gmail.com>