diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-10-13 15:52:28 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-10-13 17:40:45 +0200 |
commit | e3418e9a8544054cb7ac87e57cff54afd4ab03a1 (patch) | |
tree | 885527801ec7b879be51f12ccfb1e2197bac6bad /sal/osl | |
parent | e74fc93e4aba7887e6a278cc44c4bc0962471065 (diff) |
use consistently sal.osl and sal.rtl as log areas
Change-Id: Ib5e606283d3d37c38e9729c79c4531807a1419d3
Diffstat (limited to 'sal/osl')
-rw-r--r-- | sal/osl/unx/conditn.cxx | 38 | ||||
-rw-r--r-- | sal/osl/unx/process.cxx | 8 |
2 files changed, 23 insertions, 23 deletions
diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx index c6417bfb2f7a..c3fe130293e8 100644 --- a/sal/osl/unx/conditn.cxx +++ b/sal/osl/unx/conditn.cxx @@ -58,7 +58,7 @@ oslCondition SAL_CALL osl_createCondition() if ( pCond == 0 ) { - SAL_WARN("sal", "std::bad_alloc in C"); + SAL_WARN("sal.osl", "std::bad_alloc in C"); return 0; } @@ -69,7 +69,7 @@ oslCondition SAL_CALL osl_createCondition() if ( nRet != 0 ) { SAL_WARN( - "sal", + "sal.osl", "pthread_cond_init failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); @@ -81,13 +81,13 @@ oslCondition SAL_CALL osl_createCondition() if ( nRet != 0 ) { SAL_WARN( - "sal", + "sal.osl", "pthread_mutex_init failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); nRet = pthread_cond_destroy(&pCond->m_Condition); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_cond_destroy failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); @@ -112,12 +112,12 @@ void SAL_CALL osl_destroyCondition(oslCondition Condition) nRet = pthread_cond_destroy(&pCond->m_Condition); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_cond_destroy failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); nRet = pthread_mutex_destroy(&pCond->m_Lock); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_mutex_destroy failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); @@ -147,7 +147,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) if ( nRet != 0 ) { SAL_WARN( - "sal", + "sal.osl", "pthread_mutex_lock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); return sal_False; @@ -158,7 +158,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) if ( nRet != 0 ) { SAL_WARN( - "sal", + "sal.osl", "pthread_cond_broadcast failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); return sal_False; @@ -168,7 +168,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) if ( nRet != 0 ) { SAL_WARN( - "sal", + "sal.osl", "pthread_mutex_unlock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); return sal_False; @@ -199,7 +199,7 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition) if ( nRet != 0 ) { SAL_WARN( - "sal", + "sal.osl", "pthread_mutex_lock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); return sal_False; @@ -211,7 +211,7 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition) if ( nRet != 0 ) { SAL_WARN( - "sal", "pthread_mutex_unlock failed, errno " << nRet <<", \"" + "sal.osl", "pthread_mutex_unlock failed, errno " << nRet <<", \"" << strerror(nRet) << '"'); return sal_False; } @@ -240,7 +240,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time if ( nRet != 0 ) { SAL_WARN( - "sal", "pthread_mutex_lock failed, errno " << nRet <<", \"" + "sal.osl", "pthread_mutex_lock failed, errno " << nRet <<", \"" << strerror(nRet) << '"'); return osl_cond_result_error; } @@ -269,7 +269,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time Result = osl_cond_result_timeout; nRet = pthread_mutex_unlock(&pCond->m_Lock); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_mutex_unlock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); @@ -280,7 +280,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time Result = osl_cond_result_error; nRet = pthread_mutex_unlock(&pCond->m_Lock); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_mutex_unlock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); return Result; @@ -298,13 +298,13 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time if ( nRet != 0 ) { SAL_WARN( - "sal", + "sal.osl", "pthread_cond_wait failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); Result = osl_cond_result_error; nRet = pthread_mutex_unlock(&pCond->m_Lock); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_mutex_unlock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); @@ -315,7 +315,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time nRet = pthread_mutex_unlock(&pCond->m_Lock); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_mutex_unlock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); @@ -341,7 +341,7 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition) nRet = pthread_mutex_lock(&pCond->m_Lock); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_mutex_lock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); @@ -349,7 +349,7 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition) nRet = pthread_mutex_unlock(&pCond->m_Lock); SAL_WARN_IF( - nRet != 0, "sal", + nRet != 0, "sal.osl", "pthread_mutex_unlock failed, errno " << nRet << ", \"" << strerror(nRet) << '"'); diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index eb1fdf4a98f2..c36e71ff7b5f 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -243,7 +243,7 @@ static void ChildStatusProc(void *pData) if (socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == -1) { status = errno; - SAL_WARN("sal", "executeProcess socketpair() errno " << status); + SAL_WARN("sal.osl", "executeProcess socketpair() errno " << status); } fcntl(channel[0], F_SETFD, FD_CLOEXEC); @@ -254,21 +254,21 @@ static void ChildStatusProc(void *pData) { status = errno; assert(status != 0); - SAL_WARN("sal", "executeProcess pipe(stdInput) errno " << status); + SAL_WARN("sal.osl", "executeProcess pipe(stdInput) errno " << status); } if ( status == 0 && data.m_pOutputRead && pipe( stdOutput ) == -1 ) { status = errno; assert(status != 0); - SAL_WARN("sal", "executeProcess pipe(stdOutput) errno " << status); + SAL_WARN("sal.osl", "executeProcess pipe(stdOutput) errno " << status); } if ( status == 0 && data.m_pErrorRead && pipe( stdError ) == -1 ) { status = errno; assert(status != 0); - SAL_WARN("sal", "executeProcess pipe(stdError) errno " << status); + SAL_WARN("sal.osl", "executeProcess pipe(stdError) errno " << status); } if ( (status == 0) && ((pid = fork()) == 0) ) |