diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-11 10:35:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-11 10:35:00 +0100 |
| commit | 69f2f50c99ba218b185d94b118b38ea92b6560a0 (patch) | |
| tree | 20b5a89b5197dabda5e4bb28a84bc7ea8def9aab /sal | |
| parent | 48e236dabd6c89bda4e9e599e2ac1173f27e1b39 (diff) | |
Further socket callback clean-up
Change-Id: Ifcbb87cff50584934f214634c1b6f1d0a43ae8f3
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/sockimpl.h | 2 | ||||
| -rw-r--r-- | sal/osl/w32/socket.cxx | 10 | ||||
| -rw-r--r-- | sal/osl/w32/sockimpl.h | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h index 353d915c495e..cfcd1a4303d6 100644 --- a/sal/osl/unx/sockimpl.h +++ b/sal/osl/unx/sockimpl.h @@ -28,8 +28,6 @@ extern "C" { #endif -typedef void* (*oslCloseCallback) (void*); - struct oslSocketImpl { int m_Socket; int m_nLastError; diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 09206b126955..c200a7b7476e 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -1126,8 +1126,6 @@ oslSocket SAL_CALL osl_createSocket ( else { pSocket->m_Flags = 0; - pSocket->m_CloseCallback = NULL; - pSocket->m_CallbackArg = NULL; } return pSocket; @@ -1160,12 +1158,6 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket) closesocket(pSocket->m_Socket); pSocket->m_Socket = OSL_INVALID_SOCKET; - - /* registrierten Callback ausfuehren */ - if (pSocket->m_CloseCallback != NULL) - { - pSocket->m_CloseCallback(pSocket->m_CallbackArg); - } } /*****************************************************************************/ @@ -1423,8 +1415,6 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket ( pConnectionSocket= __osl_createSocketImpl(Connection); pConnectionSocket->m_Flags = 0; - pConnectionSocket->m_CloseCallback = NULL; - pConnectionSocket->m_CallbackArg = NULL; return pConnectionSocket; } diff --git a/sal/osl/w32/sockimpl.h b/sal/osl/w32/sockimpl.h index 8d5468ab13e4..2b5ebebb777b 100644 --- a/sal/osl/w32/sockimpl.h +++ b/sal/osl/w32/sockimpl.h @@ -32,14 +32,10 @@ extern "C" { /*****************************************************************************/ #define OSL_SOCKET_FLAGS_NONBLOCKING 0x0001 -typedef void* (SAL_CALL * oslCloseCallback) (void*); - struct oslSocketImpl { oslInterlockedCount m_nRefCount; SOCKET m_Socket; int m_Flags; - oslCloseCallback m_CloseCallback; - void* m_CallbackArg; }; struct oslSocketAddrImpl |