ucb/source/ucp/package/pkgcontent.cxx | 9 ++++----- ucb/source/ucp/tdoc/tdoc_content.cxx | 17 ++++++++--------- 2 files changed, 12 insertions(+), 14 deletions(-)
New commits: commit 21eef3b4b0e7a1a1b1b3ce8a63eb6352f5eb6e62 Author: Noel Grandin <[email protected]> Date: Sun Apr 3 17:22:48 2016 +0200 unnecessary realloc Change-Id: Iafd6495a8b6a2b371cf004e4383ed92ac6ae4bd2 Reviewed-on: https://gerrit.libreoffice.org/23760 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index e90152f..09975a7 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 08895cf..a5b7a0d 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 ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
