diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-12 15:05:28 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-13 06:10:04 +0000 |
commit | a005fbeddc4e615cfff56a9bd84355f8d42c1c8c (patch) | |
tree | f7e561a362b6aa005ceea7e6176e35f05790462a /sal/osl/unx/process.cxx | |
parent | 81f2a9f46451492d4d879573bc9ac7f2e44abedb (diff) |
OSL_TRACE->SAL in framework..sal
Change-Id: I9a897af88aa9f6f7ca98ce521c69b5a4ee8462e9
Reviewed-on: https://gerrit.libreoffice.org/31903
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/osl/unx/process.cxx')
-rw-r--r-- | sal/osl/unx/process.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index 5f4182d096f2..b9887986b775 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -181,7 +181,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)", errno, strerror(errno)); + SAL_WARN("sal", "Failed to change uid and guid, errno=" << errno << " (" << strerror(errno) << ")" ); const rtl::OUString envVar("HOME"); osl_clearEnvironment(envVar.pData); @@ -205,7 +205,7 @@ static void ChildStatusProc(void *pData) } } - OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]); + SAL_INFO("sal", "ChildStatusProc : starting " << data.m_pszArgs[0]); /* Connect std IO to pipe ends */ @@ -243,14 +243,14 @@ static void ChildStatusProc(void *pData) execv(data.m_pszArgs[0], const_cast<char **>(data.m_pszArgs)); } - OSL_TRACE("Failed to exec, errno=%d (%s)", errno, strerror(errno)); + SAL_WARN("sal", "Failed to exec, errno=" << errno << " (" << strerror(errno) << ")"); - OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]); + SAL_WARN("sal", "ChildStatusProc : starting '" << data.m_pszArgs[0] << "' failed"); /* if we reach here, something went wrong */ errno_copy = errno; if ( !safeWrite(channel[1], &errno_copy, sizeof(errno_copy)) ) - OSL_TRACE("sendFdPipe : sending failed (%s)",strerror(errno)); + SAL_WARN("sal", "sendFdPipe : sending failed (" << strerror(errno) << ")"); if ( channel[1] != -1 ) close(channel[1]); @@ -309,7 +309,7 @@ static void ChildStatusProc(void *pData) if ( child_pid < 0) { - OSL_TRACE("Failed to wait for child process, errno=%d (%s)", errno, strerror(errno)); + SAL_WARN("sal", "Failed to wait for child process, errno=" << errno << " (" << strerror(errno) << ")"); /* We got an other error than EINTR. Anyway we have to wake up the @@ -349,8 +349,8 @@ 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)", status, strerror(status)); + SAL_WARN("sal", "ChildStatusProc : starting '" << data.m_pszArgs[0] << "' failed"); + SAL_WARN("sal", "Failed to launch child process, child reports errno=" << status << " (" << strerror(status) << ")"); /* Close pipe ends */ if ( pdata->m_pInputWrite ) |