diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-04-03 17:22:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-04 09:16:58 +0000 |
| commit | 21eef3b4b0e7a1a1b1b3ce8a63eb6352f5eb6e62 (patch) | |
| tree | 01cf95f952c3a696dd31b23e5eea907a63053d1d /ucb | |
| parent | fd4b1fb453c11f8789674afc324d04ac9fb7be67 (diff) | |
unnecessary realloc
Change-Id: Iafd6495a8b6a2b371cf004e4383ed92ac6ae4bd2
Reviewed-on: https://gerrit.libreoffice.org/23760
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 9 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_content.cxx | 17 |
2 files changed, 12 insertions, 14 deletions
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index e90152f5de8d..09975a7ce3ce 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -1489,14 +1489,13 @@ uno::Any Content::open( try { uno::Sequence< sal_Int8 > aBuffer; - sal_Int32 nRead = xIn->readSomeBytes( aBuffer, 65536 ); - - while ( nRead > 0 ) + while (true) { + sal_Int32 nRead = xIn->readSomeBytes( aBuffer, 65536 ); + if (!nRead) + break; aBuffer.realloc( nRead ); xOut->writeBytes( aBuffer ); - aBuffer.realloc( 0 ); - nRead = xIn->readSomeBytes( aBuffer, 65536 ); } xOut->closeOutput(); diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 08895cfae8ca..a5b7a0d539c6 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -1484,14 +1484,14 @@ uno::Any Content::open( try { uno::Sequence< sal_Int8 > aBuffer; - sal_Int32 nRead = xIn->readSomeBytes( aBuffer, 65536 ); - while ( nRead > 0 ) + while (true) { + sal_Int32 nRead = xIn->readSomeBytes( aBuffer, 65536 ); + if (!nRead) + break; aBuffer.realloc( nRead ); xOut->writeBytes( aBuffer ); - aBuffer.realloc( 0 ); - nRead = xIn->readSomeBytes( aBuffer, 65536 ); } xOut->closeOutput(); @@ -2417,14 +2417,13 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xData, try { uno::Sequence< sal_Int8 > aBuffer; - sal_Int32 nRead = xData->readSomeBytes( aBuffer, 65536 ); - - while ( nRead > 0 ) + while (true) { + sal_Int32 nRead = xData->readSomeBytes( aBuffer, 65536 ); + if (!nRead) + break; aBuffer.realloc( nRead ); xOut->writeBytes( aBuffer ); - aBuffer.realloc( 0 ); - nRead = xData->readSomeBytes( aBuffer, 65536 ); } closeOutputStream( xOut ); |