summaryrefslogtreecommitdiff
path: root/sal/osl
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@gmail.com>2013-01-10 20:04:41 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-01-11 10:31:51 +0100
commit48e236dabd6c89bda4e9e599e2ac1173f27e1b39 (patch)
tree011b1f078017dee71404bbbe0546d2db40fd0291 /sal/osl
parentc031fde0518257b3272d5baa3de29ba5a0a90a89 (diff)
Remove useless callback in unix socket implementation
Change-Id: Ibe46e2f1628f4d2e4840429703e0d5a69059a188 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal/osl')
-rw-r--r--sal/osl/unx/socket.c14
-rw-r--r--sal/osl/unx/sockimpl.h2
2 files changed, 0 insertions, 16 deletions
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 1af903910c8d..a9f3fc07192f 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -469,8 +469,6 @@ oslSocket __osl_createSocketImpl(int Socket)
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 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily Family,
{
pSocket->m_nLastError=errno;
}
-
-
- pSocket->m_CloseCallback = NULL;
- pSocket->m_CallbackArg = NULL;
}
return pSocket;
@@ -1560,12 +1554,6 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
}
#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 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
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 d2c68b655758..353d915c495e 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -33,8 +33,6 @@ typedef void* (*oslCloseCallback) (void*);
struct oslSocketImpl {
int m_Socket;
int m_nLastError;
- oslCloseCallback m_CloseCallback;
- void* m_CallbackArg;
oslInterlockedCount m_nRefCount;
#if defined(LINUX)
sal_Bool m_bIsAccepting;