mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unnecessary realloc

Browse Source 
Change-Id: Iafd6495a8b6a2b371cf004e4383ed92ac6ae4bd2
Reviewed-on: https://gerrit.libreoffice.org/23760
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-04-03 17:22:48 +02:00
parent fd4b1fb453
commit 21eef3b4b0
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ucb/source/ucp/package/pkgcontent.cxx
View File

@@ -1489,14 +1489,13 @@ uno::Any Content::open(
try try
{ {
uno::Sequence< sal_Int8 > aBuffer; uno::Sequence< sal_Int8 > aBuffer;
sal_Int32 nRead = xIn->readSomeBytes( aBuffer, 65536 ); while (true)
while ( nRead > 0 )
{ {
sal_Int32 nRead = xIn->readSomeBytes( aBuffer, 65536 );
if (!nRead)
break;
aBuffer.realloc( nRead ); aBuffer.realloc( nRead );
xOut->writeBytes( aBuffer ); xOut->writeBytes( aBuffer );
aBuffer.realloc( 0 );
nRead = xIn->readSomeBytes( aBuffer, 65536 );
} }
xOut->closeOutput(); xOut->closeOutput();

17
ucb/source/ucp/tdoc/tdoc_content.cxx
View File

@@ -1484,14 +1484,14 @@ uno::Any Content::open(
try try
{ {
uno::Sequence< sal_Int8 > aBuffer; 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 ); aBuffer.realloc( nRead );
xOut->writeBytes( aBuffer ); xOut->writeBytes( aBuffer );
aBuffer.realloc( 0 );
nRead = xIn->readSomeBytes( aBuffer, 65536 );
} }
xOut->closeOutput(); xOut->closeOutput();
@@ -2417,14 +2417,13 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xData,
try try
{ {
uno::Sequence< sal_Int8 > aBuffer; uno::Sequence< sal_Int8 > aBuffer;
sal_Int32 nRead = xData->readSomeBytes( aBuffer, 65536 ); while (true)
while ( nRead > 0 )
{ {
sal_Int32 nRead = xData->readSomeBytes( aBuffer, 65536 );
if (!nRead)
break;
aBuffer.realloc( nRead ); aBuffer.realloc( nRead );
xOut->writeBytes( aBuffer ); xOut->writeBytes( aBuffer );
aBuffer.realloc( 0 );
nRead = xData->readSomeBytes( aBuffer, 65536 );
} }
closeOutputStream( xOut ); closeOutputStream( xOut );