[Libreoffice-commits] core.git: include/sal sal/osl
Stephan Bergmann
sbergman at redhat.com
Tue Dec 13 10:04:38 UTC 2016
include/sal/log-areas.dox | 1 -
sal/osl/unx/process.cxx | 16 ++++++++--------
sal/osl/unx/signal.cxx | 2 +-
sal/osl/w32/profile.cxx | 30 +++++++++++++++---------------
sal/osl/w32/socket.cxx | 2 +-
5 files changed, 25 insertions(+), 26 deletions(-)
New commits:
commit 58fc735175c37ac9a31578481b8173054fb49f63
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Dec 13 11:03:55 2016 +0100
Reuse existing sal.osl log area
Change-Id: Ib1fc80c79355322489b7ebd37cbbbbb6614ec67a
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index f812fc8..c343151e 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -20,7 +20,6 @@ certain functionality.
@section SAL
- at li @c sal
@li @c sal.bootstrap - SAL bootstrap
@li @c sal.debug - SAL debugging functionality
@li @c sal.file
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index b988798..21b24d3 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))
- SAL_WARN("sal", "Failed to change uid and guid, errno=" << errno << " (" << strerror(errno) << ")" );
+ SAL_WARN("sal.osl", "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)
}
}
- SAL_INFO("sal", "ChildStatusProc : starting " << data.m_pszArgs[0]);
+ SAL_INFO("sal.osl", "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));
}
- SAL_WARN("sal", "Failed to exec, errno=" << errno << " (" << strerror(errno) << ")");
+ SAL_WARN("sal.osl", "Failed to exec, errno=" << errno << " (" << strerror(errno) << ")");
- SAL_WARN("sal", "ChildStatusProc : starting '" << data.m_pszArgs[0] << "' failed");
+ SAL_WARN("sal.osl", "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)) )
- SAL_WARN("sal", "sendFdPipe : sending failed (" << strerror(errno) << ")");
+ SAL_WARN("sal.osl", "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)
{
- SAL_WARN("sal", "Failed to wait for child process, errno=" << errno << " (" << strerror(errno) << ")");
+ SAL_WARN("sal.osl", "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
{
- SAL_WARN("sal", "ChildStatusProc : starting '" << data.m_pszArgs[0] << "' failed");
- SAL_WARN("sal", "Failed to launch child process, child reports errno=" << status << " (" << strerror(status) << ")");
+ SAL_WARN("sal.osl", "ChildStatusProc : starting '" << data.m_pszArgs[0] << "' failed");
+ SAL_WARN("sal.osl", "Failed to launch child process, child reports errno=" << status << " (" << strerror(status) << ")");
/* Close pipe ends */
if ( pdata->m_pInputWrite )
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 69242d2..3892818 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -256,7 +256,7 @@ bool onInitSignal()
if (sigemptyset(&unset) < 0 ||
pthread_sigmask(SIG_SETMASK, &unset, nullptr) < 0)
{
- SAL_WARN("sal", "sigemptyset or pthread_sigmask failed");
+ SAL_WARN("sal.osl", "sigemptyset or pthread_sigmask failed");
}
return true;
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 6928c61..86592b0 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -191,23 +191,23 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
if ( Flags == osl_Profile_DEFAULT )
{
- SAL_INFO("sal", "with osl_Profile_DEFAULT");
+ SAL_INFO("sal.osl", "with osl_Profile_DEFAULT");
}
if ( Flags & osl_Profile_SYSTEM )
{
- SAL_INFO("sal", "with osl_Profile_SYSTEM");
+ SAL_INFO("sal.osl", "with osl_Profile_SYSTEM");
}
if ( Flags & osl_Profile_READLOCK )
{
- SAL_INFO("sal", "with osl_Profile_READLOCK");
+ SAL_INFO("sal.osl", "with osl_Profile_READLOCK");
}
if ( Flags & osl_Profile_WRITELOCK )
{
- SAL_INFO("sal", "with osl_Profile_WRITELOCK");
+ SAL_INFO("sal.osl", "with osl_Profile_WRITELOCK");
}
if ( Flags & osl_Profile_FLUSHWRITE )
{
- SAL_INFO("sal", "with osl_Profile_FLUSHWRITE");
+ SAL_INFO("sal.osl", "with osl_Profile_FLUSHWRITE");
}
#endif
@@ -331,7 +331,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
if ( pProfile->m_Flags & FLG_MODIFIED )
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "swapping to storeprofile");
+ SAL_INFO("sal.osl", "swapping to storeprofile");
#endif
bRet = storeProfile(pProfile,false);
}
@@ -354,7 +354,7 @@ static bool writeProfileImpl(osl_TFile* pFile)
if ( bRet == 0 || BytesWritten == 0 )
{
OSL_ENSURE(bRet,"WriteFile failed!!!");
- SAL_WARN("sal", "write failed " << strerror(errno));
+ SAL_WARN("sal.osl", "write failed " << strerror(errno));
return false;
}
@@ -1014,7 +1014,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "setting bWriteable to TRUE");
+ SAL_INFO("sal.osl", "setting bWriteable to TRUE");
#endif
bWriteable=true;
}
@@ -1031,7 +1031,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
else
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "opening read/write " << pszFilename);
+ SAL_INFO("sal.osl", "opening read/write " << pszFilename);
#endif
if ((pFile->m_Handle = CreateFileW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strFileName )), GENERIC_READ | GENERIC_WRITE,
@@ -1051,7 +1051,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
if ( ProfileFlags & (osl_Profile_WRITELOCK | osl_Profile_READLOCK ) )
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "locking file " << pszFilename);
+ SAL_INFO("sal.osl", "locking file " << pszFilename);
#endif
lockFile(pFile, bWriteable ? write_lock : read_lock);
@@ -1820,7 +1820,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable)
if (pProfile == nullptr)
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "AUTOOPEN MODE");
+ SAL_INFO("sal.osl", "AUTOOPEN MODE");
#endif
if ( ( pProfile = static_cast<osl_TProfileImpl*>(osl_openProfile( nullptr, PFlags )) ) != nullptr )
@@ -1831,7 +1831,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "try to acquire");
+ SAL_INFO("sal.osl", "try to acquire");
#endif
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
@@ -1841,7 +1841,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable)
{
osl_TStamp Stamp;
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "DEFAULT MODE");
+ SAL_INFO("sal.osl", "DEFAULT MODE");
#endif
pProfile->m_pFile = openFileImpl(
pProfile->m_strFileName, pProfile->m_Flags | PFlags);
@@ -1860,7 +1860,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "READ/WRITELOCK MODE");
+ SAL_INFO("sal.osl", "READ/WRITELOCK MODE");
#endif
/* A readlock file could not be written */
@@ -1891,7 +1891,7 @@ static bool releaseProfile(osl_TProfileImpl* pProfile)
else
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal", "DEFAULT MODE");
+ SAL_INFO("sal.osl", "DEFAULT MODE");
#endif
if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index fd36705..4468521 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -594,7 +594,7 @@ static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he)
/* unknown address family */
/* future extensions for new families might be implemented here */
- SAL_WARN("sal", "_osl_hostentToHostAddr(): unknown address family.");
+ SAL_WARN("sal.osl", "_osl_hostentToHostAddr(): unknown address family.");
OSL_ASSERT(sal_False);
osl_destroySocketAddr_( pSocketAddr );
More information about the Libreoffice-commits
mailing list