diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 08:47:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-15 07:26:17 +0100 |
| commit | 7d8e94444d989d0ac4a4055b207726708e9ec0da (patch) | |
| tree | ce3e4a09ed7932496c4d901360ff23787c8f6e24 /tools/source | |
| parent | 80fb8d406ced47e6a2089f0c8ba5c103d2fec91f (diff) | |
convert a<b?a:b to std::min(a,b)
with something like
git grep -nP '(.*)\s*<\s*(.*)\s*\?\s*\g1\s*:\s*\g2' -- *.?xx
Change-Id: Id5078b35961847feb78a66204fdb7598ee63fd23
Note: we also convert a>b?b:a
Reviewed-on: https://gerrit.libreoffice.org/47736
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/zcodec/zcodec.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 174753bac248..ffa53955719b 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -146,7 +146,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm ) if ( PZSTREAM->avail_out == 0 ) ImplWriteBack(); if ( PZSTREAM->avail_in == 0 && mnInToRead ) { - nInToRead = ( mnInBufSize > mnInToRead ) ? mnInToRead : mnInBufSize; + nInToRead = std::min( mnInBufSize, mnInToRead ); PZSTREAM->next_in = mpInBuf; PZSTREAM->avail_in = rIStm.ReadBytes(mpInBuf, nInToRead); mnInToRead -= nInToRead; @@ -212,7 +212,7 @@ long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize ) { if ( PZSTREAM->avail_in == 0 && mnInToRead ) { - nInToRead = (mnInBufSize > mnInToRead) ? mnInToRead : mnInBufSize; + nInToRead = std::min(mnInBufSize, mnInToRead); PZSTREAM->next_in = mpInBuf; PZSTREAM->avail_in = rIStm.ReadBytes(mpInBuf, nInToRead); mnInToRead -= nInToRead; @@ -256,7 +256,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize { if ( PZSTREAM->avail_in == 0 && mnInToRead ) { - nInToRead = (mnInBufSize > mnInToRead) ? mnInToRead : mnInBufSize; + nInToRead = std::min(mnInBufSize, mnInToRead); sal_uInt32 const nRemaining = rIStm.remainingSize(); if (nRemaining < nInToRead) |