[Libreoffice-commits] core.git: sal/osl

Stephan Bergmann sbergman at redhat.com
Wed Feb 11 00:02:10 PST 2015


 sal/osl/unx/conditn.cxx |   20 --------------------
 1 file changed, 20 deletions(-)

New commits:
commit 3ff852364b37f5ca7a7670e6a93907044b8769ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 11 09:01:23 2015 +0100

    coverity#1267660 etc.: remove redundant checks
    
    ...all these functions take a "handle to a created condition."
    
    Change-Id: I043f310801452b05e6daaca4d246b305d18f6104

diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx
index f5fedd4..37040bf 100644
--- a/sal/osl/unx/conditn.cxx
+++ b/sal/osl/unx/conditn.cxx
@@ -105,11 +105,6 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
    assert(Condition);
    pCond = (oslConditionImpl*)Condition;
 
-   if ( pCond == 0 )
-   {
-       return sal_False;
-   }
-
    nRet = pthread_mutex_lock(&pCond->m_Lock);
    if ( nRet != 0 )
    {
@@ -149,11 +144,6 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
 
     pCond = (oslConditionImpl*)Condition;
 
-    if ( pCond == 0 )
-    {
-        return sal_False;
-    }
-
     nRet = pthread_mutex_lock(&pCond->m_Lock);
     if ( nRet != 0 )
     {
@@ -186,11 +176,6 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
 
     SAL_INFO( "sal.osl.condition", "osl_waitCondition(" << pCond << ")" );
 
-    if ( pCond == 0 )
-    {
-        return osl_cond_result_error;
-    }
-
     nRet = pthread_mutex_lock(&pCond->m_Lock);
     if ( nRet != 0 )
     {
@@ -270,11 +255,6 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
     assert(Condition);
     pCond = (oslConditionImpl*)Condition;
 
-    if ( pCond == 0 )
-    {
-        return sal_False;
-    }
-
     nRet = pthread_mutex_lock(&pCond->m_Lock);
     SAL_WARN_IF( nRet != 0, "sal.osl.condition", "osl_checkCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) );
 


More information about the Libreoffice-commits mailing list