mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further socket callback clean-up

Browse Source 
Change-Id: Ifcbb87cff50584934f214634c1b6f1d0a43ae8f3
This commit is contained in:
Stephan Bergmann
2013-01-11 10:35:00 +01:00
parent 48e236dabd
commit 69f2f50c99
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sal/osl/unx/sockimpl.h
View File

@@ -28,8 +28,6 @@
extern "C" { extern "C" {
#endif #endif
typedef void* (*oslCloseCallback) (void*);
struct oslSocketImpl { struct oslSocketImpl {
int m_Socket; int m_Socket;
int m_nLastError; int m_nLastError;

10
sal/osl/w32/socket.cxx
View File

@@ -1126,8 +1126,6 @@ oslSocket SAL_CALL osl_createSocket (
else else
{ {
pSocket->m_Flags = 0; pSocket->m_Flags = 0;
pSocket->m_CloseCallback = NULL;
pSocket->m_CallbackArg = NULL;
} }
return pSocket; return pSocket;
@@ -1160,12 +1158,6 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
closesocket(pSocket->m_Socket); closesocket(pSocket->m_Socket);
pSocket->m_Socket = OSL_INVALID_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= __osl_createSocketImpl(Connection);
pConnectionSocket->m_Flags = 0; pConnectionSocket->m_Flags = 0;
pConnectionSocket->m_CloseCallback = NULL;
pConnectionSocket->m_CallbackArg = NULL;
return pConnectionSocket; return pConnectionSocket;
} }

4
sal/osl/w32/sockimpl.h
View File

@@ -32,14 +32,10 @@ extern "C" {
/*****************************************************************************/ /*****************************************************************************/
#define OSL_SOCKET_FLAGS_NONBLOCKING 0x0001 #define OSL_SOCKET_FLAGS_NONBLOCKING 0x0001
typedef void* (SAL_CALL * oslCloseCallback) (void*);
struct oslSocketImpl { struct oslSocketImpl {
oslInterlockedCount m_nRefCount; oslInterlockedCount m_nRefCount;
SOCKET m_Socket; SOCKET m_Socket;
int m_Flags; int m_Flags;
oslCloseCallback m_CloseCallback;
void* m_CallbackArg;
}; };
struct oslSocketAddrImpl struct oslSocketAddrImpl