diff options
| author | Rohan Kumar <rohankanojia420@gmail.com> | 2016-03-02 01:28:58 +0530 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-03-03 17:00:26 +0000 |
| commit | f59136a2ed1e3eb01cc5b62c5a7da07c34cbdfae (patch) | |
| tree | e34d2b6db403fce36c6d8a57e9c3adf31c935e90 /sal/osl | |
| parent | f336f63da900d76c2bf6e5690f1c8a7bd15a0aa2 (diff) | |
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
Change-Id: If329cf8257684e7bd2936641b8f14ec3e9b9f733
Reviewed-on: https://gerrit.libreoffice.org/22647
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/unx/profile.cxx | 4 | ||||
| -rw-r--r-- | sal/osl/unx/socket.cxx | 10 | ||||
| -rw-r--r-- | sal/osl/w32/socket.cxx | 12 |
3 files changed, 12 insertions, 14 deletions
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index 8cad96512bfb..9cbab6be72c2 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -320,7 +320,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) static bool writeProfileImpl(osl_TFile* pFile) { -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 unsigned int nLen=0; #endif @@ -329,7 +329,7 @@ static bool writeProfileImpl(osl_TFile* pFile) return false; } -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 nLen=strlen(pFile->m_pWriteBuf); SAL_WARN_IF(nLen != (pFile->m_nWriteBufLen - pFile->m_nWriteBufFree), "sal.osl", "nLen != (pFile->m_nWriteBufLen - pFile->m_nWriteBufFree)"); #endif diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 190e7c3bc2bb..1065c792221f 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -429,7 +429,7 @@ oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr ( void SAL_CALL osl_psz_getLastSocketErrorDescription ( oslSocket Socket, sal_Char* pBuffer, sal_uInt32 BufferSize); -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 static sal_uInt32 g_nSocketImpl = 0; static sal_uInt32 g_nSocketAddr = 0; @@ -451,7 +451,7 @@ oslSocket __osl_createSocketImpl(int Socket) pSocket->m_bIsAccepting = false; #endif -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 g_nSocketImpl ++; #endif return pSocket; @@ -461,7 +461,7 @@ void __osl_destroySocketImpl(oslSocket Socket) { if ( Socket != nullptr) free(Socket); -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 g_nSocketImpl --; #endif } @@ -469,7 +469,7 @@ void __osl_destroySocketImpl(oslSocket Socket) static oslSocketAddr __osl_createSocketAddr() { oslSocketAddr pAddr = static_cast<oslSocketAddr>(rtl_allocateZeroMemory( sizeof( struct oslSocketAddrImpl ))); -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 g_nSocketAddr ++; #endif return pAddr; @@ -509,7 +509,7 @@ static oslSocketAddr __osl_createSocketAddrFromSystem( struct sockaddr *pSystemS static void __osl_destroySocketAddr( oslSocketAddr addr ) { -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 g_nSocketAddr --; #endif rtl_freeMemory( addr ); diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 927da21c8844..e3aad35d424c 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -406,16 +406,14 @@ static sal_Bool __osl_attemptSocketDialupImpl() /*****************************************************************************/ static sal_uInt32 g_nSocketImpl = 0; -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 static sal_uInt32 g_nSocketAddr = 0; struct LeakWarning { ~LeakWarning() { - if( g_nSocketImpl ) - OSL_TRACE( "sal_socket: %d socket instances leak" , g_nSocketImpl ); - if( g_nSocketAddr ) - OSL_TRACE( "sal_socket: %d socket address instances leak" , g_nSocketAddr ); + SAL_WARN_IF( g_nSocketImpl, "sal.w32", "sal_socket: " << g_nSocketImpl << " socket instances leak" ); + SAL_WARN_IF( g_nSocketAddr, "sal.w32", "sal_socket: " << g_nSocketAddr << " socket address instances leak" ); } }; LeakWarning socketWarning; @@ -455,7 +453,7 @@ static oslSocketAddr __osl_createSocketAddr( ) { oslSocketAddr pAddr = (oslSocketAddr) rtl_allocateZeroMemory( sizeof( struct oslSocketAddrImpl )); pAddr->m_nRefCount = 1; -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 g_nSocketAddr ++; #endif return pAddr; @@ -493,7 +491,7 @@ static oslSocketAddr __osl_createSocketAddrFromSystem( struct sockaddr *pSystemS static void __osl_destroySocketAddr( oslSocketAddr addr ) { -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 g_nSocketAddr --; #endif rtl_freeMemory( addr ); |