summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-09-20 10:18:12 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-09-21 09:28:39 +0200
commitbe6a8677a6ddb6387272a78406ec2149c4319f3d (patch)
tree0e6be3608de08f831f596a5c2dc5a3590d4a62c6 /sal
parent6058133765a1f874d6bf9fb9f4d0811db32adc10 (diff)
OSL_TRACE: Remove trailing newlines
Done with perl regex: s/(\n\s*OSL_TRACE\(\s*\"[^\n]+?)\s*(\\n)+(\"[^\n]*\)\;\n)/$1$3/gs; - removed trailing whitespaces and (multiple) newlines
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/module.c8
-rw-r--r--sal/osl/unx/nlsupport.c2
-rw-r--r--sal/osl/unx/pipe.c16
-rw-r--r--sal/osl/unx/process.c22
-rw-r--r--sal/osl/unx/profile.c184
-rw-r--r--sal/osl/unx/semaphor.c2
-rw-r--r--sal/osl/unx/socket.c10
-rw-r--r--sal/osl/unx/thread.c10
-rw-r--r--sal/osl/unx/util.c10
-rw-r--r--sal/osl/w32/process.cxx10
-rw-r--r--sal/osl/w32/profile.cxx118
-rw-r--r--sal/osl/w32/socket.cxx6
12 files changed, 199 insertions, 199 deletions
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 4654e5a28cca..63fbc20b68b2 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -92,7 +92,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR
#if OSL_DEBUG_LEVEL > 1
if (pLib == 0)
- OSL_TRACE("Error osl_loadModule: %s\n", dlerror());
+ OSL_TRACE("Error osl_loadModule: %s", dlerror());
#endif /* OSL_DEBUG_LEVEL */
return ((oslModule)(pLib));
@@ -168,7 +168,7 @@ osl_getAsciiFunctionSymbol(oslModule Module, const sal_Char *pSymbol)
fcnAddr = dlsym(Module, pSymbol);
if (!fcnAddr)
- OSL_TRACE("Error osl_getAsciiFunctionSymbol: %s\n", dlerror());
+ OSL_TRACE("Error osl_getAsciiFunctionSymbol: %s", dlerror());
}
#endif
@@ -249,7 +249,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
if (workDir)
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s\n", filename);
+ OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s", filename);
#endif
rtl_string2UString(ppLibraryUrl,
filename,
@@ -281,7 +281,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
if (workDir)
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s\n", dl_info.dli_fname);
+ OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s", dl_info.dli_fname);
#endif
rtl_string2UString(ppLibraryUrl,
dl_info.dli_fname,
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index 3dc687c03c7b..fcfb0509face 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -909,7 +909,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
setenv("LANG", locale, 1 );
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE("_imp_getProcessLocale() returning %s as current locale.\n", locale );
+ OSL_TRACE("_imp_getProcessLocale() returning %s as current locale.", locale );
#endif
// pthread_mutex_unlock( &aLocalMutex );
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index 5fdbcb035f7e..6deac995123a 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -220,7 +220,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
pPipe->m_Socket = socket(AF_UNIX, SOCK_STREAM, 0);
if ( pPipe->m_Socket < 0 )
{
- OSL_TRACE("osl_createPipe socket failed. Errno: %d; %s\n",errno, strerror(errno));
+ OSL_TRACE("osl_createPipe socket failed. Errno: %d; %s",errno, strerror(errno));
__osl_destroyPipeImpl(pPipe);
return NULL;
}
@@ -233,7 +233,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
Flags |= FD_CLOEXEC;
if (fcntl(pPipe->m_Socket, F_SETFD, Flags) == -1)
{
- OSL_TRACE("osl_createPipe failed changing socket flags. Errno: %d; %s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe failed changing socket flags. Errno: %d; %s",errno,strerror(errno));
}
}
@@ -259,7 +259,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
{
if ( connect(pPipe->m_Socket,(struct sockaddr *)&addr,len) >= 0 )
{
- OSL_TRACE("osl_createPipe : Pipe already in use. Errno: %d; %s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe : Pipe already in use. Errno: %d; %s",errno,strerror(errno));
close (pPipe->m_Socket);
__osl_destroyPipeImpl(pPipe);
return NULL;
@@ -271,7 +271,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
/* ok, fs clean */
if ( bind(pPipe->m_Socket, (struct sockaddr *)&addr, len) < 0 )
{
- OSL_TRACE("osl_createPipe : failed to bind socket. Errno: %d; %s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe : failed to bind socket. Errno: %d; %s",errno,strerror(errno));
close (pPipe->m_Socket);
__osl_destroyPipeImpl(pPipe);
return NULL;
@@ -288,7 +288,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
if ( listen(pPipe->m_Socket, 5) < 0 )
{
- OSL_TRACE("osl_createPipe failed to listen. Errno: %d; %s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe failed to listen. Errno: %d; %s",errno,strerror(errno));
unlink(name); /* remove filesystem entry */
close (pPipe->m_Socket);
__osl_destroyPipeImpl(pPipe);
@@ -306,7 +306,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
return (pPipe);
}
- OSL_TRACE("osl_createPipe failed to connect. Errno: %d; %s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe failed to connect. Errno: %d; %s",errno,strerror(errno));
}
close (pPipe->m_Socket);
@@ -388,13 +388,13 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
nRet = shutdown(ConnFD, 2);
if ( nRet < 0 )
{
- OSL_TRACE("shutdown in destroyPipe failed : '%s'\n",strerror(errno));
+ OSL_TRACE("shutdown in destroyPipe failed : '%s'",strerror(errno));
}
nRet = close(ConnFD);
if ( nRet < 0 )
{
- OSL_TRACE("close in destroyPipe failed : '%s'\n",strerror(errno));
+ OSL_TRACE("close in destroyPipe failed : '%s'",strerror(errno));
}
/* remove filesystem entry */
if ( strlen(pPipe->m_Name) > 0 )
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 07cd315882f7..de30ddb6e69f 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -275,7 +275,7 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
if ( ( nSend = sendmsg(PipeFD, &msg, 0) ) > 0 )
{
bRet = sal_True;
- OSL_TRACE("sendFdPipe : send '%i' bytes\n",nSend);
+ OSL_TRACE("sendFdPipe : send '%i' bytes",nSend);
}
else
@@ -287,11 +287,11 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
if ( bRet && RetCode == 1 )
{
- OSL_TRACE("sendFdPipe : resource was received\n");
+ OSL_TRACE("sendFdPipe : resource was received");
}
else
{
- OSL_TRACE("sendFdPipe : resource wasn't received (error %s)\n", strerror(errno));
+ OSL_TRACE("sendFdPipe : resource wasn't received (error %s)", strerror(errno));
}
#if defined(IOCHANNEL_TRANSFER_BSD_RENO)
@@ -318,7 +318,7 @@ static oslSocket receiveFdPipe(int PipeFD)
#if defined(IOCHANNEL_TRANSFER_BSD)
- OSL_TRACE("IOCHANNEL_TRANSFER_BSD receive\n");
+ OSL_TRACE("IOCHANNEL_TRANSFER_BSD receive");
iov[0].iov_base = buffer;
iov[0].iov_len = sizeof(buffer);
@@ -351,14 +351,14 @@ static oslSocket receiveFdPipe(int PipeFD)
if ( ( nRead = recvmsg(PipeFD, &msghdr, 0) ) > 0 )
{
- OSL_TRACE("receiveFdPipe : received '%i' bytes\n",nRead);
+ OSL_TRACE("receiveFdPipe : received '%i' bytes",nRead);
}
#else
if ( ( ( nRead = recvmsg(PipeFD, &msghdr, 0) ) > 0 ) &&
( msghdr.msg_controllen == CONTROLLEN ) )
{
- OSL_TRACE("receiveFdPipe : received '%i' bytes\n",nRead);
+ OSL_TRACE("receiveFdPipe : received '%i' bytes",nRead);
memcpy(&newfd, CMSG_DATA(cmptr), sizeof(int));
}
#endif
@@ -371,7 +371,7 @@ static oslSocket receiveFdPipe(int PipeFD)
{
pSocket = __osl_createSocketImpl(newfd);
nRetCode=1;
- OSL_TRACE("received fd %i\n",newfd);
+ OSL_TRACE("received fd %i",newfd);
}
OSL_TRACE("receiveFdPipe : writing back %i",nRetCode);
@@ -489,7 +489,7 @@ static void ChildStatusProc(void *pData)
OSL_ASSERT(geteuid() == 0); /* must be root */
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
- OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
+ OSL_TRACE("Failed to change uid and guid, errno=%d (%s)", errno, strerror(errno));
#if defined(LINUX) || defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
unsetenv("HOME");
#else
@@ -553,7 +553,7 @@ static void ChildStatusProc(void *pData)
execv(data.m_pszArgs[0], (sal_Char **)data.m_pszArgs);
}
- OSL_TRACE("Failed to exec, errno=%d (%s)\n", errno, strerror(errno));
+ OSL_TRACE("Failed to exec, errno=%d (%s)", errno, strerror(errno));
OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
@@ -618,7 +618,7 @@ static void ChildStatusProc(void *pData)
if ( child_pid < 0)
{
- OSL_TRACE("Failed to wait for child process, errno=%d (%s)\n", errno, strerror(errno));
+ OSL_TRACE("Failed to wait for child process, errno=%d (%s)", errno, strerror(errno));
/*
We got an other error than EINTR. Anyway we have to wake up the
@@ -658,7 +658,7 @@ static void ChildStatusProc(void *pData)
else
{
OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
- OSL_TRACE("Failed to launch child process, child reports errno=%d (%s)\n", status, strerror(status));
+ OSL_TRACE("Failed to launch child process, child reports errno=%d (%s)", status, strerror(status));
/* Close pipe ends */
if ( pdata->m_pInputWrite )
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index f4def519aad1..cfdb5ea9bcce 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -201,32 +201,32 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_openProfile\n");
+ OSL_TRACE("In osl_openProfile");
#endif
#ifdef DEBUG_OSL_PROFILE
Flags=osl_Profile_FLUSHWRITE;
- OSL_TRACE("opening '%s'\n",pszProfileName);
+ OSL_TRACE("opening '%s'",pszProfileName);
if ( Flags == osl_Profile_DEFAULT )
{
- OSL_TRACE("with osl_Profile_DEFAULT\n");
+ OSL_TRACE("with osl_Profile_DEFAULT");
}
if ( Flags & osl_Profile_SYSTEM )
{
- OSL_TRACE("with osl_Profile_SYSTEM\n");
+ OSL_TRACE("with osl_Profile_SYSTEM");
}
if ( Flags & osl_Profile_READLOCK )
{
- OSL_TRACE("with osl_Profile_READLOCK\n");
+ OSL_TRACE("with osl_Profile_READLOCK");
}
if ( Flags & osl_Profile_WRITELOCK )
{
- OSL_TRACE("with osl_Profile_WRITELOCK\n");
+ OSL_TRACE("with osl_Profile_WRITELOCK");
}
if ( Flags & osl_Profile_FLUSHWRITE )
{
- OSL_TRACE("with osl_Profile_FLUSHWRITE\n");
+ OSL_TRACE("with osl_Profile_FLUSHWRITE");
}
#endif
@@ -234,7 +234,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
if ( ( pFile = openFileImpl(pszProfileName, Flags ) ) == NULL )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_openProfile [not opened]\n");
+ OSL_TRACE("Out osl_openProfile [not opened]");
#endif
return (NULL);
}
@@ -267,7 +267,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
closeFileImpl(pFile,pProfile->m_Flags);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_openProfile [ok]\n");
+ OSL_TRACE("Out osl_openProfile [ok]");
#endif
return (pProfile);
}
@@ -278,13 +278,13 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
osl_TProfileImpl* pTmpProfile;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_closeProfile\n");
+ OSL_TRACE("In osl_closeProfile");
#endif
if ( Profile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [profile==0]\n");
+ OSL_TRACE("Out osl_closeProfile [profile==0]");
#endif
return sal_False;
}
@@ -296,7 +296,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
OSL_ASSERT(pProfile->m_bIsValid);
pthread_mutex_unlock(&(pProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [not valid]\n");
+ OSL_TRACE("Out osl_closeProfile [not valid]");
#endif
return sal_False;
}
@@ -324,7 +324,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
{
pthread_mutex_unlock(&(pProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [pProfile==0]\n");
+ OSL_TRACE("Out osl_closeProfile [pProfile==0]");
#endif
return sal_False;
}
@@ -377,7 +377,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
free(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [ok]\n");
+ OSL_TRACE("Out osl_closeProfile [ok]");
#endif
return (sal_True);
}
@@ -390,13 +390,13 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_flushProfile()\n");
+ OSL_TRACE("In osl_flushProfile()");
#endif
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [pProfile == 0]\n");
+ OSL_TRACE("Out osl_flushProfile() [pProfile == 0]");
#endif
return sal_False;
}
@@ -408,7 +408,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
OSL_ASSERT(pProfile->m_bIsValid);
pthread_mutex_unlock(&(pProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile [not valid]\n");
+ OSL_TRACE("Out osl_flushProfile [not valid]");
#endif
return sal_False;
}
@@ -418,7 +418,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
{
pthread_mutex_unlock(&(pProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [invalid file]\n");
+ OSL_TRACE("Out osl_flushProfile() [invalid file]");
#endif
return sal_False;
}
@@ -426,14 +426,14 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
if ( pProfile->m_Flags & FLG_MODIFIED )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("swapping to storeprofile\n");
+ OSL_TRACE("swapping to storeprofile");
#endif
bRet = storeProfile(pProfile,sal_False);
OSL_ASSERT(bRet);
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [ok]\n");
+ OSL_TRACE("Out osl_flushProfile() [ok]");
#endif
pthread_mutex_unlock(&(pProfile->m_AccessLock));
return bRet;
@@ -446,13 +446,13 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
#endif
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileImpl()\n");
+ OSL_TRACE("In osl_writeProfileImpl()");
#endif
if ( !( pFile != 0 && pFile->m_Handle >= 0 ) || ( pFile->m_pWriteBuf == 0 ) )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileImpl() [invalid args]\n");
+ OSL_TRACE("Out osl_writeProfileImpl() [invalid args]");
#endif
return sal_False;
}
@@ -464,7 +464,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
if ( !safeWrite(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree) )
{
- OSL_TRACE("write failed '%s'\n",strerror(errno));
+ OSL_TRACE("write failed '%s'",strerror(errno));
return (sal_False);
}
@@ -473,7 +473,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
pFile->m_nWriteBufLen=0;
pFile->m_nWriteBufFree=0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileImpl() [ok]\n");
+ OSL_TRACE("Out osl_writeProfileImpl() [ok]");
#endif
return sal_True;
}
@@ -492,7 +492,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileString\n");
+ OSL_TRACE("In osl_readProfileString");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -500,7 +500,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pTmpProfile==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pTmpProfile==0]");
#endif
return sal_False;
}
@@ -511,7 +511,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [not valid]\n");
+ OSL_TRACE("Out osl_readProfileString [not valid]");
#endif
return sal_False;
}
@@ -521,7 +521,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
if ( pProfile == NULL )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pProfile==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pProfile==0]");
#endif
return (sal_False);
}
@@ -561,7 +561,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pStr==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pStr==0]");
#endif
return sal_False;
}
@@ -569,7 +569,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [ok]\n");
+ OSL_TRACE("Out osl_readProfileString [ok]");
#endif
return (sal_True);
@@ -584,7 +584,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
Line[0] = '\0';
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileBool\n");
+ OSL_TRACE("In osl_readProfileBool");
#endif
if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
@@ -601,7 +601,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileBool [ok]\n");
+ OSL_TRACE("Out osl_readProfileBool [ok]");
#endif
return (Default);
@@ -618,7 +618,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
Line[0] = '\0';
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileIdent\n");
+ OSL_TRACE("In osl_readProfileIdent");
#endif
if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
@@ -636,7 +636,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileIdent [ok]\n");
+ OSL_TRACE("Out osl_readProfileIdent [ok]");
#endif
return (Default);
}
@@ -655,7 +655,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
osl_TProfileImpl* pTmpProfile = 0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileString\n");
+ OSL_TRACE("In osl_writeProfileString");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -663,7 +663,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [pTmpProfile==0]\n");
+ OSL_TRACE("Out osl_writeProfileString [pTmpProfile==0]");
#endif
return sal_False;
}
@@ -675,7 +675,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not valid]\n");
+ OSL_TRACE("Out osl_writeProfileString [not valid]");
#endif
return sal_False;
}
@@ -686,7 +686,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [pProfile==0]\n");
+ OSL_TRACE("Out osl_writeProfileString [pProfile==0]");
#endif
return (sal_False);
}
@@ -716,7 +716,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
free(Line);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not added]\n");
+ OSL_TRACE("Out osl_writeProfileString [not added]");
#endif
return (sal_False);
}
@@ -747,7 +747,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
free(Line);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not inserted]\n");
+ OSL_TRACE("Out osl_writeProfileString [not inserted]");
#endif
return (sal_False);
}
@@ -778,7 +778,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [ok]\n");
+ OSL_TRACE("Out osl_writeProfileString [ok]");
#endif
return bRet;
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
sal_Bool bRet=sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileBool\n");
+ OSL_TRACE("In osl_writeProfileBool");
#endif
if (Value)
@@ -801,7 +801,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLZERO);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileBool [ok]\n");
+ OSL_TRACE("Out osl_writeProfileBool [ok]");
#endif
return bRet;
@@ -817,7 +817,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
sal_Bool bRet=sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileIdent\n");
+ OSL_TRACE("In osl_writeProfileIdent");
#endif
for (n = 0; Strings[n] != NULL; n++);
@@ -828,7 +828,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
bRet = osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileIdent\n");
+ OSL_TRACE("Out osl_writeProfileIdent");
#endif
return bRet;
}
@@ -844,7 +844,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_removeProfileEntry\n");
+ OSL_TRACE("In osl_removeProfileEntry");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -852,7 +852,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]");
#endif
return sal_False;
}
@@ -864,7 +864,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [not valid]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [not valid]");
#endif
return sal_False;
}
@@ -876,7 +876,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]");
#endif
return (sal_False);
}
@@ -913,7 +913,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [ok]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [ok]");
#endif
return bRet;
}
@@ -930,7 +930,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_getProfileSectionEntries\n");
+ OSL_TRACE("In osl_getProfileSectionEntries");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -938,7 +938,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [pTmpProfile==0]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [pTmpProfile==0]");
#endif
return sal_False;
@@ -953,7 +953,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [not valid]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [not valid]");
#endif
return sal_False;
@@ -966,7 +966,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]");
#endif
return (0);
@@ -1017,7 +1017,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [ok]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [ok]");
#endif
return (n);
@@ -1032,7 +1032,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_getProfileSections\n");
+ OSL_TRACE("In osl_getProfileSections");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -1040,7 +1040,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSections [pTmpProfile==0]\n");
+ OSL_TRACE("Out osl_getProfileSections [pTmpProfile==0]");
#endif
return sal_False;
}
@@ -1052,7 +1052,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSections [not valid]\n");
+ OSL_TRACE("Out osl_getProfileSections [not valid]");
#endif
return sal_False;
}
@@ -1064,7 +1064,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSections [pProfile==0]\n");
+ OSL_TRACE("Out osl_getProfileSections [pProfile==0]");
#endif
return (0);
}
@@ -1109,7 +1109,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSections [ok]\n");
+ OSL_TRACE("Out osl_getProfileSections [ok]");
#endif
return (n);
@@ -1140,7 +1140,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
static sal_Bool bLockingDisabled;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In OslProfile_lockFile\n");
+ OSL_TRACE("In OslProfile_lockFile");
#endif
if ( !bIsInitialized )
@@ -1164,7 +1164,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
if (pFile->m_Handle < 0)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out OslProfile_lockFile [invalid file handle]\n");
+ OSL_TRACE("Out OslProfile_lockFile [invalid file handle]");
#endif
return (sal_False);
}
@@ -1173,7 +1173,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
if ( bLockingDisabled )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out OslProfile_lockFile [locking disabled]\n");
+ OSL_TRACE("Out OslProfile_lockFile [locking disabled]");
#endif
return (sal_True);
}
@@ -1205,15 +1205,15 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
if ( fcntl(pFile->m_Handle, F_SETLKW, &lock) == -1 && errno != ENOTSUP )
#endif /* MACOSX */
{
- OSL_TRACE("fcntl returned -1 (%s)\n",strerror(errno));
+ OSL_TRACE("fcntl returned -1 (%s)",strerror(errno));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out OslProfile_lockFile [fcntl F_SETLKW]\n");
+ OSL_TRACE("Out OslProfile_lockFile [fcntl F_SETLKW]");
#endif
return sal_False;
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out OslProfile_lockFile [ok]\n");
+ OSL_TRACE("Out OslProfile_lockFile [ok]");
#endif
return sal_True;
}
@@ -1227,7 +1227,7 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption Pro
if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("setting bWriteable to TRUE\n");
+ OSL_TRACE("setting bWriteable to TRUE");
#endif
bWriteable=sal_True;
}
@@ -1235,7 +1235,7 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption Pro
if (! bWriteable)
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("opening '%s' read only\n",pszFilename);
+ OSL_TRACE("opening '%s' read only",pszFilename);
#endif
pFile->m_Handle = open(pszFilename, O_RDONLY);
@@ -1245,14 +1245,14 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption Pro
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("opening '%s' read/write\n",pszFilename);
+ OSL_TRACE("opening '%s' read/write",pszFilename);
#endif
if (((pFile->m_Handle = open(pszFilename, O_RDWR | O_CREAT | O_EXCL, DEFAULT_PMODE)) < 0) &&
((pFile->m_Handle = open(pszFilename, O_RDWR)) < 0))
{
free(pFile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out openFileImpl [open read/write]\n");
+ OSL_TRACE("Out openFileImpl [open read/write]");
#endif
return (NULL);
}
@@ -1272,13 +1272,13 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption Pro
if ( ProfileFlags & (osl_Profile_WRITELOCK | osl_Profile_READLOCK ) )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("locking '%s' file\n",pszFilename);
+ OSL_TRACE("locking '%s' file",pszFilename);
#endif
OslProfile_lockFile(pFile, bWriteable ? write_lock : read_lock);
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out openFileImpl [ok]\n");
+ OSL_TRACE("Out openFileImpl [ok]");
#endif
return (pFile);
}
@@ -1288,13 +1288,13 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags)
osl_TStamp stamp = 0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In closeFileImpl\n");
+ OSL_TRACE("In closeFileImpl");
#endif
if ( pFile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out closeFileImpl [pFile == 0]\n");
+ OSL_TRACE("Out closeFileImpl [pFile == 0]");
#endif
return stamp;
}
@@ -1321,7 +1321,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags)
free(pFile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out closeFileImpl [ok]\n");
+ OSL_TRACE("Out closeFileImpl [ok]");
#endif
return(stamp);
@@ -1331,7 +1331,7 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
{
sal_Bool bRet = sal_True;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_OslProfile_rewindFile\n");
+ OSL_TRACE("In osl_OslProfile_rewindFile");
#endif
if (pFile->m_Handle >= 0)
@@ -1339,14 +1339,14 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("rewinding\n");
+ OSL_TRACE("rewinding");
#endif
bRet = (lseek(pFile->m_Handle, SEEK_SET, 0L) == 0L);
if (bTruncate)
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("truncating\n");
+ OSL_TRACE("truncating");
#endif
bRet &= (ftruncate(pFile->m_Handle, 0L) == 0);
}
@@ -1354,7 +1354,7 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_OslProfile_rewindFile [ok]\n");
+ OSL_TRACE("Out osl_OslProfile_rewindFile [ok]");
#endif
return bRet;
}
@@ -1389,7 +1389,7 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile)
if ((Max = read(pFile->m_Handle, &pFile->m_ReadBuf[Bytes], Free)) < 0)
{
- OSL_TRACE("read failed '%s'\n",strerror(errno));
+ OSL_TRACE("read failed '%s'",strerror(errno));
if( pLine )
rtl_freeMemory( pLine );
@@ -1945,7 +1945,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In storeProfile\n");
+ OSL_TRACE("In storeProfile");
#endif
if (pProfile->m_Lines != NULL)
@@ -1980,7 +1980,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
pTmpFile->m_nWriteBufFree=0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out storeProfile [not flushed]\n");
+ OSL_TRACE("Out storeProfile [not flushed]");
#endif
closeFileImpl(pTmpFile,pProfile->m_Flags);
@@ -2019,7 +2019,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out storeProfile [ok]\n");
+ OSL_TRACE("Out storeProfile [ok]");
#endif
return (sal_True);
}
@@ -2115,7 +2115,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
if (pProfile == NULL)
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("AUTOOPEN MODE\n");
+ OSL_TRACE("AUTOOPEN MODE");
#endif
if ( ( pProfile = (osl_TProfileImpl*) osl_openProfile(0, PFlags ) ) != NULL )
@@ -2126,7 +2126,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("try to acquire\n");
+ OSL_TRACE("try to acquire");
#endif
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
@@ -2136,7 +2136,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
osl_TStamp Stamp;
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("Profile acquire DEFAULT MODE\n");
+ OSL_TRACE("Profile acquire DEFAULT MODE");
#endif
if (! (pProfile->m_pFile = openFileImpl(pProfile->m_FileName, pProfile->m_Flags | PFlags )))
return NULL;
@@ -2157,7 +2157,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("Profile acquire READ/WRITELOCK MODE\n");
+ OSL_TRACE("Profile acquire READ/WRITELOCK MODE");
#endif
/* A readlock file could not be written */
if ((pProfile->m_Flags & osl_Profile_READLOCK) && bWriteable)
@@ -2174,13 +2174,13 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In releaseProfile\n");
+ OSL_TRACE("In releaseProfile");
#endif
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [profile==0]\n");
+ OSL_TRACE("Out releaseProfile [profile==0]");
#endif
return sal_False;
}
@@ -2188,14 +2188,14 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
if (pProfile->m_Flags & FLG_AUTOOPEN)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [AUTOOPEN]\n");
+ OSL_TRACE("Out releaseProfile [AUTOOPEN]");
#endif
return (osl_closeProfile((oslProfile)pProfile));
}
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("DEFAULT MODE\n");
+ OSL_TRACE("DEFAULT MODE");
#endif
if (! (pProfile->m_Flags & (osl_Profile_READLOCK | osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE )))
{
@@ -2212,7 +2212,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [ok]\n");
+ OSL_TRACE("Out releaseProfile [ok]");
#endif
return (sal_True);
}
diff --git a/sal/osl/unx/semaphor.c b/sal/osl/unx/semaphor.c
index b34395eb44ce..7cb375f49c43 100644
--- a/sal/osl/unx/semaphor.c
+++ b/sal/osl/unx/semaphor.c
@@ -205,7 +205,7 @@ oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
if(semctl(pSem->m_Id, 0, IPC_RMID, arg) < 0)
{
- OSL_TRACE("semctl(IPC_RMID) failed. Errno: %d; %s\n", errno, strerror(errno));
+ OSL_TRACE("semctl(IPC_RMID) failed. Errno: %d; %s", errno, strerror(errno));
}
free(Semaphore);
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 39a733af36c9..bd114d5cb71f 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -1053,7 +1053,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he)
/* unknown address family */
/* future extensions for new families might be implemented here */
- OSL_TRACE("_osl_hostentToHostAddr: unknown address family.\n");
+ OSL_TRACE("_osl_hostentToHostAddr: unknown address family.");
OSL_ASSERT(sal_False);
__osl_destroySocketAddr( pSockAddr );
@@ -1742,7 +1742,7 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
if ( nRet != 0 )
{
pSocket->m_nLastError=errno;
- OSL_TRACE("closeSocket close error '%s'\n",strerror(errno));
+ OSL_TRACE("closeSocket close error '%s'",strerror(errno));
}
pSocket->m_Socket = OSL_INVALID_SOCKET;
@@ -2032,7 +2032,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
if( Connection == OSL_SOCKET_ERROR )
{
pSocket->m_nLastError=errno;
- OSL_TRACE("osl_acceptConnectionOnSocket : accept error '%s'\n",strerror(errno));
+ OSL_TRACE("osl_acceptConnectionOnSocket : accept error '%s'",strerror(errno));
#if defined(LINUX)
pSocket->m_bIsAccepting = sal_False;
@@ -2047,7 +2047,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
if ( pSocket->m_bIsInShutdown == sal_True )
{
close(Connection);
- OSL_TRACE("osl_acceptConnectionOnSocket : close while accept\n");
+ OSL_TRACE("osl_acceptConnectionOnSocket : close while accept");
return 0;
}
#endif /* LINUX */
@@ -2506,7 +2506,7 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket pSocket,
if (nRet != 0 )
{
pSocket->m_nLastError=errno;
- OSL_TRACE("shutdown error '%s'\n",strerror(errno));
+ OSL_TRACE("shutdown error '%s'",strerror(errno));
}
return (nRet==0);
}
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index bfe86f7fadc5..520274305ed4 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -766,7 +766,7 @@ static void osl_thread_priority_init_Impl (void)
if ((nRet = pthread_getschedparam(pthread_self(), &policy, &param)) != 0)
{
- OSL_TRACE("failed to get priority of thread [%s]\n",strerror(nRet));
+ OSL_TRACE("failed to get priority of thread [%s]",strerror(nRet));
return;
}
@@ -782,7 +782,7 @@ static void osl_thread_priority_init_Impl (void)
if ((nRet = sched_get_priority_min(policy) ) != -1)
{
- OSL_TRACE("Min Prioriy for policy '%i' == '%i'\n",policy,nRet);
+ OSL_TRACE("Min Prioriy for policy '%i' == '%i'",policy,nRet);
g_thread.m_priority.m_Lowest=nRet;
}
#if OSL_DEBUG_LEVEL > 1
@@ -794,7 +794,7 @@ static void osl_thread_priority_init_Impl (void)
if ((nRet = sched_get_priority_max(policy) ) != -1)
{
- OSL_TRACE("Max Prioriy for policy '%i' == '%i'\n",policy,nRet);
+ OSL_TRACE("Max Prioriy for policy '%i' == '%i'",policy,nRet);
g_thread.m_priority.m_Highest=nRet;
}
#if OSL_DEBUG_LEVEL > 1
@@ -817,7 +817,7 @@ static void osl_thread_priority_init_Impl (void)
if ((nRet = pthread_setschedparam(pthread_self(), policy, &param)) != 0)
{
- OSL_TRACE("failed to change base priority of thread [%s]\n",strerror(nRet));
+ OSL_TRACE("failed to change base priority of thread [%s]",strerror(nRet));
OSL_TRACE("Thread ID '%i', Policy '%i', Priority '%i'\n",pthread_self(),policy,param.sched_priority);
}
@@ -907,7 +907,7 @@ void SAL_CALL osl_setThreadPriority (
if ((nRet = pthread_setschedparam(pImpl->m_hThread, policy, &Param)) != 0)
{
- OSL_TRACE("failed to change thread priority [%s]\n",strerror(nRet));
+ OSL_TRACE("failed to change thread priority [%s]",strerror(nRet));
}
#endif /* NO_PTHREAD_PRIORITY */
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index 923b14bea32c..7411e7f2a81a 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -91,7 +91,7 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
ifc.ifc_buf = buff;
if ( ioctl(so, SIOCGIFCONF, &ifc) < 0 )
{
- OSL_TRACE( "SIOCGIFCONF: %s\n", strerror(errno) );
+ OSL_TRACE( "SIOCGIFCONF: %s", strerror(errno) );
close(so);
return sal_False;
}
@@ -140,7 +140,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
if ( ret < 0 )
{
- OSL_TRACE( "SIOCGIFFLAGS: %s\n", strerror(errno) );
+ OSL_TRACE( "SIOCGIFFLAGS: %s", strerror(errno) );
close(so);
return ret;
}
@@ -152,7 +152,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
if (ifr.ifr_flags & IFF_LOOPBACK)
{
- OSL_TRACE( "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno) );
+ OSL_TRACE( "SIOCGIFFLAGS : is LOOPBACK : %s", strerror(errno) );
close(so);
return 0;
}
@@ -169,7 +169,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
#endif
if (ret < 0) {
- OSL_TRACE( "SIOCGIFADDR: %s\n", strerror(errno) );
+ OSL_TRACE( "SIOCGIFADDR: %s", strerror(errno) );
memset(hard_addr, 0, 32);
close(so);
return ret;
@@ -192,7 +192,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
ret=osl_checkAddr(hard_addr);
if (ret < 0) {
- OSL_TRACE( "SIOCGIFADDR got '00:00:00:00:00:00'\n" );
+ OSL_TRACE( "SIOCGIFADDR got '00:00:00:00:00:00'" );
return ret;
}
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 3fec90a8483a..718f293cac1b 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -596,7 +596,7 @@ sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe hPipe, oslSocket pSocket)
if (bRet)
{
sal_Int32 commitCode;
- OSL_TRACE("osl_sendResourcePipe: handle sent successfully, verify...\n");
+ OSL_TRACE("osl_sendResourcePipe: handle sent successfully, verify...");
if (
!ReadPipe(hPipe, &commitCode, sizeof(commitCode), &bytes) ||
@@ -605,7 +605,7 @@ sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe hPipe, oslSocket pSocket)
bRet = sal_False;
}
- OSL_TRACE("osl_sendResourcePipe: exit... %d\n", bRet);
+ OSL_TRACE("osl_sendResourcePipe: exit... %d", bRet);
return(bRet);
}
@@ -623,7 +623,7 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
DWORD myProcessID = GetCurrentProcessId();
oslDescriptorType code = osl_Process_TypeNone;
- OSL_TRACE("osl_receiveResourcePipe: enter...\n");
+ OSL_TRACE("osl_receiveResourcePipe: enter...");
if (
WritePipe(hPipe, &myProcessID, sizeof(myProcessID), &bytes) &&
@@ -638,7 +638,7 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
}
else
{
- OSL_TRACE("osl_receiveResourcePipe: UKNOWN\n");
+ OSL_TRACE("osl_receiveResourcePipe: UKNOWN");
bRet = sal_False;
}
}
@@ -650,7 +650,7 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
WritePipe(hPipe, &commitCode, sizeof(commitCode), &bytes);
- OSL_TRACE("osl_receiveResourcePipe: exit... %d, %p\n", bRet, pSocket);
+ OSL_TRACE("osl_receiveResourcePipe: exit... %d, %p", bRet, pSocket);
return pSocket;
}
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 54b92684c31a..84403846927d 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -196,7 +196,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
rtl_uString *FileName=NULL;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_openProfile\n");
+ OSL_TRACE("In osl_openProfile");
#endif
OSL_VERIFY(strProfileName);
@@ -219,19 +219,19 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
// OSL_TRACE("opening '%s'\n",FileName);
if ( Flags == osl_Profile_DEFAULT )
{
- OSL_TRACE("with osl_Profile_DEFAULT \n");
+ OSL_TRACE("with osl_Profile_DEFAULT");
}
if ( Flags & osl_Profile_SYSTEM )
{
- OSL_TRACE("with osl_Profile_SYSTEM \n");
+ OSL_TRACE("with osl_Profile_SYSTEM");
}
if ( Flags & osl_Profile_READLOCK )
{
- OSL_TRACE("with osl_Profile_READLOCK \n");
+ OSL_TRACE("with osl_Profile_READLOCK");
}
if ( Flags & osl_Profile_WRITELOCK )
{
- OSL_TRACE("with osl_Profile_WRITELOCK \n");
+ OSL_TRACE("with osl_Profile_WRITELOCK");
}
/* if ( Flags & osl_Profile_READWRITE ) */
/* { */
@@ -239,14 +239,14 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
/* } */
if ( Flags & osl_Profile_FLUSHWRITE )
{
- OSL_TRACE("with osl_Profile_FLUSHWRITE \n");
+ OSL_TRACE("with osl_Profile_FLUSHWRITE");
}
#endif
if ( (! (Flags & osl_Profile_SYSTEM)) && ( (pFile = openFileImpl(FileName, Flags) ) == NULL ) )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_openProfile [not opened]\n");
+ OSL_TRACE("Out osl_openProfile [not opened]");
#endif
if( FileName)
rtl_uString_release( FileName);
@@ -273,7 +273,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
closeFileImpl(pFile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_openProfile [ok]\n");
+ OSL_TRACE("Out osl_openProfile [ok]");
#endif
if( FileName)
rtl_uString_release( FileName);
@@ -286,13 +286,13 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_closeProfile\n");
+ OSL_TRACE("In osl_closeProfile");
#endif
if ( Profile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [profile==0]\n");
+ OSL_TRACE("Out osl_closeProfile [profile==0]");
#endif
return sal_False;
}
@@ -319,7 +319,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [pProfile==0]\n");
+ OSL_TRACE("Out osl_closeProfile [pProfile==0]");
#endif
return sal_False;
}
@@ -364,7 +364,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
free(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [ok]\n");
+ OSL_TRACE("Out osl_closeProfile [ok]");
#endif
return (sal_True);
}
@@ -377,13 +377,13 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_flushProfile()\n");
+ OSL_TRACE("In osl_flushProfile()");
#endif
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [pProfile == 0]\n");
+ OSL_TRACE("Out osl_flushProfile() [pProfile == 0]");
#endif
return sal_False;
}
@@ -392,7 +392,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
if ( !( pFile != 0 && pFile->m_Handle >= 0 ) )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [invalid file]\n");
+ OSL_TRACE("Out osl_flushProfile() [invalid file]");
#endif
return sal_False;
}
@@ -400,13 +400,13 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
if ( pProfile->m_Flags & FLG_MODIFIED )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("swapping to storeprofile\n");
+ OSL_TRACE("swapping to storeprofile");
#endif
bRet = storeProfile(pProfile,sal_False);
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [ok]\n");
+ OSL_TRACE("Out osl_flushProfile() [ok]");
#endif
return bRet;
}
@@ -417,13 +417,13 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
BOOL bRet;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileImpl()\n");
+ OSL_TRACE("In osl_writeProfileImpl()");
#endif
if ( !( pFile != 0 && pFile->m_Handle != INVALID_HANDLE_VALUE ) || ( pFile->m_pWriteBuf == 0 ) )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileImpl() [invalid args]\n");
+ OSL_TRACE("Out osl_writeProfileImpl() [invalid args]");
#endif
return sal_False;
}
@@ -439,7 +439,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
{
OSL_ENSURE(bRet,"WriteFile failed!!!");
- OSL_TRACE("write failed '%s'\n",strerror(errno));
+ OSL_TRACE("write failed '%s'",strerror(errno));
/* OSL_TRACE("Out osl_writeProfileImpl() [write '%s']\n",strerror(errno));*/
return (sal_False);
@@ -451,7 +451,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
pFile->m_nWriteBufFree=0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileImpl() [ok]\n");
+ OSL_TRACE("Out osl_writeProfileImpl() [ok]");
#endif
return sal_True;
}
@@ -469,7 +469,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileString\n");
+ OSL_TRACE("In osl_readProfileString");
#endif
pProfile = acquireProfile(Profile, sal_False);
@@ -477,7 +477,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
if (pProfile == NULL)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pProfile==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pProfile==0]");
#endif
@@ -517,7 +517,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
if ( pStr == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pStr==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pStr==0]");
#endif
@@ -525,7 +525,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [ok]\n");
+ OSL_TRACE("Out osl_readProfileString [ok]");
#endif
@@ -542,7 +542,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
sal_Char Line[32];
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileBool\n");
+ OSL_TRACE("In osl_readProfileBool");
#endif
if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
@@ -559,7 +559,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileBool [ok]\n");
+ OSL_TRACE("Out osl_readProfileBool [ok]");
#endif
return (Default);
@@ -575,7 +575,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
sal_Char Line[256];
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileIdent\n");
+ OSL_TRACE("In osl_readProfileIdent");
#endif
if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
@@ -593,7 +593,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileIdent [ok]\n");
+ OSL_TRACE("Out osl_readProfileIdent [ok]");
#endif
return (Default);
}
@@ -611,7 +611,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
osl_TProfileImpl* pProfile = 0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileString\n");
+ OSL_TRACE("In osl_writeProfileString");
#endif
pProfile = acquireProfile(Profile, sal_True);
@@ -619,7 +619,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
if (pProfile == NULL)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [pProfile==0]\n");
+ OSL_TRACE("Out osl_writeProfileString [pProfile==0]");
#endif
return (sal_False);
}
@@ -642,7 +642,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
{
releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not added]\n");
+ OSL_TRACE("Out osl_writeProfileString [not added]");
#endif
return (sal_False);
}
@@ -668,7 +668,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
{
releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not inserted]\n");
+ OSL_TRACE("Out osl_writeProfileString [not inserted]");
#endif
return (sal_False);
}
@@ -695,7 +695,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
bRet = releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [ok]\n");
+ OSL_TRACE("Out osl_writeProfileString [ok]");
#endif
return bRet;
}
@@ -708,7 +708,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileBool\n");
+ OSL_TRACE("In osl_writeProfileBool");
#endif
if (Value)
@@ -717,7 +717,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLZERO);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileBool [ok]\n");
+ OSL_TRACE("Out osl_writeProfileBool [ok]");
#endif
return bRet;
@@ -733,7 +733,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileIdent\n");
+ OSL_TRACE("In osl_writeProfileIdent");
#endif
for (n = 0; Strings[n] != NULL; n++);
@@ -744,7 +744,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
bRet=osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileIdent\n");
+ OSL_TRACE("Out osl_writeProfileIdent");
#endif
return bRet;
}
@@ -759,7 +759,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_removeProfileEntry\n");
+ OSL_TRACE("In osl_removeProfileEntry");
#endif
pProfile = acquireProfile(Profile, sal_True);
@@ -767,7 +767,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
if (pProfile == NULL)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]");
#endif
@@ -806,7 +806,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
bRet = releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [ok]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [ok]");
#endif
return bRet;
}
@@ -821,7 +821,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
osl_TProfileImpl* pProfile = 0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_getProfileSectionEntries\n");
+ OSL_TRACE("In osl_getProfileSectionEntries");
#endif
pProfile = acquireProfile(Profile, sal_False);
@@ -829,7 +829,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
if (pProfile == NULL)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]");
#endif
@@ -881,7 +881,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [ok]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [ok]");
#endif
return (n);
@@ -1269,7 +1269,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("setting bWriteable to TRUE\n");
+ OSL_TRACE("setting bWriteable to TRUE");
#endif
bWriteable=sal_True;
}
@@ -1286,7 +1286,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("opening '%s' read/write\n",pszFilename);
+ OSL_TRACE("opening '%s' read/write",pszFilename);
#endif
if ((pFile->m_Handle = CreateFileW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strFileName )), GENERIC_READ | GENERIC_WRITE,
@@ -1306,7 +1306,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
if ( ProfileFlags & (osl_Profile_WRITELOCK | osl_Profile_READLOCK ) )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("locking '%s' file\n",pszFilename);
+ OSL_TRACE("locking '%s' file",pszFilename);
#endif
lockFile(pFile, bWriteable ? write_lock : read_lock);
@@ -1976,7 +1976,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In storeProfile\n");
+ OSL_TRACE("In storeProfile");
#endif
if (pProfile->m_Lines != NULL)
@@ -2011,7 +2011,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
pTmpFile->m_nWriteBufFree=0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out storeProfile [not flushed]\n");
+ OSL_TRACE("Out storeProfile [not flushed]");
#endif
closeFileImpl(pTmpFile);
@@ -2051,7 +2051,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out storeProfile [ok]\n");
+ OSL_TRACE("Out storeProfile [ok]");
#endif
return (sal_True);
}
@@ -2181,7 +2181,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
if (pProfile == NULL)
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("AUTOOPEN MODE\n");
+ OSL_TRACE("AUTOOPEN MODE");
#endif
@@ -2194,7 +2194,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("try to acquire\n");
+ OSL_TRACE("try to acquire");
#endif
@@ -2206,7 +2206,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
{
osl_TStamp Stamp;
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("DEFAULT MODE\n");
+ OSL_TRACE("DEFAULT MODE");
#endif
pProfile->m_pFile = openFileImpl(
pProfile->m_strFileName, pProfile->m_Flags | PFlags);
@@ -2225,7 +2225,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("READ/WRITELOCK MODE\n");
+ OSL_TRACE("READ/WRITELOCK MODE");
#endif
@@ -2244,13 +2244,13 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In releaseProfile\n");
+ OSL_TRACE("In releaseProfile");
#endif
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [profile==0]\n");
+ OSL_TRACE("Out releaseProfile [profile==0]");
#endif
return sal_False;
}
@@ -2260,14 +2260,14 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
if (pProfile->m_Flags & FLG_AUTOOPEN)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [AUTOOPEN]\n");
+ OSL_TRACE("Out releaseProfile [AUTOOPEN]");
#endif
return (osl_closeProfile((oslProfile)pProfile));
}
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("DEFAULT MODE\n");
+ OSL_TRACE("DEFAULT MODE");
#endif
if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
@@ -2282,7 +2282,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [ok]\n");
+ OSL_TRACE("Out releaseProfile [ok]");
#endif
return (sal_True);
}
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 505507d61acf..8a0bc31f034f 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -437,9 +437,9 @@ struct LeakWarning
~LeakWarning()
{
if( g_nSocketImpl )
- OSL_TRACE( "sal_socket: %d socket instances leak\n" , g_nSocketImpl );
+ OSL_TRACE( "sal_socket: %d socket instances leak" , g_nSocketImpl );
if( g_nSocketAddr )
- OSL_TRACE( "sal_socket: %d socket address instances leak\n" , g_nSocketAddr );
+ OSL_TRACE( "sal_socket: %d socket address instances leak" , g_nSocketAddr );
}
};
LeakWarning socketWarning;
@@ -756,7 +756,7 @@ static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he)
/* unknown address family */
/* future extensions for new families might be implemented here */
- OSL_TRACE("_osl_hostentToHostAddr(): unknown address family.\n");
+ OSL_TRACE("_osl_hostentToHostAddr(): unknown address family.");
OSL_ASSERT(sal_False);
__osl_destroySocketAddr( pSocketAddr );