diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-29 11:36:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-29 20:56:17 +0200 |
| commit | 80f28e377db0ca04da57eed77d42f44cbdea363d (patch) | |
| tree | 44268ab2601aedd6a34a9a40f943cd1f55e400ea /sal | |
| parent | 5f56f07e9278e357a079cbecb5366da98e36d97f (diff) | |
loplugin:simplifybool in oox..sd
Change-Id: I76cbd5d3e65f0b392d713a51607f5c88dae79593
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95101
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/profile.cxx | 4 | ||||
| -rw-r--r-- | sal/rtl/cipher.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index ce3742bc8a10..31cfc8575f73 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -306,7 +306,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) } pFile = pProfile->m_pFile; - if ( !( pFile != nullptr && pFile->m_Handle >= 0 ) ) + if ( pFile == nullptr || pFile->m_Handle < 0 ) { pthread_mutex_unlock(&(pProfile->m_AccessLock)); @@ -325,7 +325,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) static bool writeProfileImpl(osl_TFile* pFile) { - if ( !( pFile != nullptr && pFile->m_Handle >= 0 ) || ( pFile->m_pWriteBuf == nullptr ) ) + if ( pFile == nullptr || pFile->m_Handle < 0 || pFile->m_pWriteBuf == nullptr ) { return false; } diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 34428654975f..db9b1bdd20bf 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -718,7 +718,7 @@ static rtlCipherError BF_update( if (!pData || !pBuffer) return rtl_Cipher_E_Argument; - if (!((nDatLen > 0) && (nDatLen <= nBufLen))) + if ((nDatLen <= 0) || (nDatLen > nBufLen)) return rtl_Cipher_E_BufferSize; /* Update. */ @@ -1265,7 +1265,7 @@ static rtlCipherError rtl_cipherARCFOUR_update_Impl( if (!pData || !pBuffer) return rtl_Cipher_E_Argument; - if (!((0 < nDatLen) && (nDatLen <= nBufLen))) + if ((0 >= nDatLen) || (nDatLen > nBufLen)) return rtl_Cipher_E_BufferSize; #if defined LIBO_CIPHER_OPENSSL_BACKEND |