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

Remove useless callback in unix socket implementation

Browse Source 
Change-Id: Ibe46e2f1628f4d2e4840429703e0d5a69059a188
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Arnaud Versini
2013-01-10 20:04:41 +01:00
committed by Stephan Bergmann
parent c031fde051
commit 48e236dabd
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sal/osl/unx/socket.c
View File

@@ -469,8 +469,6 @@ oslSocket __osl_createSocketImpl(int Socket)
pSocket->m_Socket = Socket; pSocket->m_Socket = Socket;
pSocket->m_nLastError = 0; pSocket->m_nLastError = 0;
pSocket->m_CloseCallback = 0;
pSocket->m_CallbackArg = 0;
pSocket->m_nRefCount = 1; pSocket->m_nRefCount = 1;
#if defined(LINUX) #if defined(LINUX)
@@ -1466,10 +1464,6 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily Family,
{ {
pSocket->m_nLastError=errno; pSocket->m_nLastError=errno;
} }
pSocket->m_CloseCallback = NULL;
pSocket->m_CallbackArg = NULL;
} }
return pSocket; return pSocket;
@@ -1560,12 +1554,6 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
} }
#endif /* LINUX */ #endif /* LINUX */
/* registrierten Callback ausfuehren */
if (pSocket->m_CloseCallback != NULL)
{
pSocket->m_CloseCallback(pSocket->m_CallbackArg);
}
nRet=close(nFD); nRet=close(nFD);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
@@ -1905,8 +1893,6 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
pConnectionSockImpl->m_Socket = Connection; pConnectionSockImpl->m_Socket = Connection;
pConnectionSockImpl->m_nLastError = 0; pConnectionSockImpl->m_nLastError = 0;
pConnectionSockImpl->m_CloseCallback = NULL;
pConnectionSockImpl->m_CallbackArg = NULL;
#if defined(LINUX) #if defined(LINUX)
pConnectionSockImpl->m_bIsAccepting = sal_False; pConnectionSockImpl->m_bIsAccepting = sal_False;

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

@@ -33,8 +33,6 @@ typedef void* (*oslCloseCallback) (void*);
struct oslSocketImpl { struct oslSocketImpl {
int m_Socket; int m_Socket;
int m_nLastError; int m_nLastError;
oslCloseCallback m_CloseCallback;
void* m_CallbackArg;
oslInterlockedCount m_nRefCount; oslInterlockedCount m_nRefCount;
#if defined(LINUX) #if defined(LINUX)
sal_Bool m_bIsAccepting; sal_Bool m_bIsAccepting;