diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 16:45:25 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 16:45:25 +0000 |
| commit | 35c2678a1d5d20d9eab3582e3f9626f8d5ecc972 (patch) | |
| tree | a196697da42125c0df806f1d2e1c8967dd4e464b | |
| parent | 2bf3c12a77a61db0bcd084367b430b9bf48031b8 (diff) | |
INTEGRATION: CWS dbgmacros1 (1.6.72); FILE MERGED
2003/04/09 12:08:40 kso 1.6.72.1: #108413# - debug macro unification.
| -rw-r--r-- | sal/osl/w32/socket.cxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 0382d201f20f..88ce5bec21d4 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -2,9 +2,9 @@ * * $RCSfile: socket.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2003-04-11 14:24:24 $ + * last change: $Author: vg $ $Date: 2003-04-15 17:45:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -546,7 +546,7 @@ static sal_Bool __osl_attemptSocketDialupImpl (void) /*****************************************************************************/ static sal_uInt32 g_nSocketImpl = 0; -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 static sal_uInt32 g_nSocketAddr = 0; struct LeakWarning { @@ -595,7 +595,7 @@ static oslSocketAddr __osl_createSocketAddr( ) { oslSocketAddr pAddr = (oslSocketAddr) rtl_allocateZeroMemory( sizeof( struct oslSocketAddrImpl )); pAddr->m_nRefCount = 1; -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 g_nSocketAddr ++; #endif return pAddr; @@ -633,7 +633,7 @@ static oslSocketAddr __osl_createSocketAddrFromSystem( struct sockaddr *pSystemS static void __osl_destroySocketAddr( oslSocketAddr addr ) { -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 g_nSocketAddr --; #endif rtl_freeMemory( addr ); @@ -839,9 +839,6 @@ static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he) oslSocketAddr pSocketAddr = 0; rtl_uString *cn= NULL; -#ifdef _DEBUG - const sal_Char fct[] = "_osl_hostentToHostAddr()"; -#endif /* _DEBUG */ if ((he == NULL) || (he->h_name == NULL) || (he->h_addr_list[0] == NULL)) return ((oslHostAddr)NULL); @@ -872,9 +869,7 @@ static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he) /* unknown address family */ /* future extensions for new families might be implemented here */ -#ifdef DEBUG - OSL_TRACE("%s: unknown address family.\n", fct); -#endif + OSL_TRACE("_osl_hostentToHostAddr(): unknown address family.\n"); OSL_ASSERT(sal_False); __osl_destroySocketAddr( pSocketAddr ); |