diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:13:30 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:13:30 +0000 |
| commit | 0f75309fd0586ff4aee07e05ed22dbb16cf23c7a (patch) | |
| tree | 06d1e7ad4bb8ddfdc3c55d259c2b4b179f55fc82 /package/source | |
| parent | 62987d7d47c885b3599e076119f20d1bb61022be (diff) | |
INTEGRATION: CWS warnings01 (1.9.22); FILE MERGED
2006/02/21 10:39:24 cd 1.9.22.4: #i55991# Warning free code for Windows C++ compiler
2005/11/01 17:10:23 cd 1.9.22.3: #i53898# Warning free code for sun sparc compiler
2005/09/23 03:38:35 sb 1.9.22.2: RESYNC: (1.9-1.10); FILE MERGED
2005/09/15 15:27:59 abi 1.9.22.1: #i53898# warning free
Diffstat (limited to 'package/source')
| -rw-r--r-- | package/source/zipapi/XUnbufferedStream.cxx | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index 1f6f026290b1..38f069241d13 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -4,9 +4,9 @@ * * $RCSfile: XUnbufferedStream.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:14:43 $ + * last change: $Author: hr $ $Date: 2006-06-20 06:13:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,20 +79,20 @@ XUnbufferedStream::XUnbufferedStream( ZipEntry & rEntry, sal_Bool bIsEncrypted, const ::rtl::OUString& aMediaType, sal_Bool bRecoveryMode ) -: maEntry ( rEntry ) +: mxZipStream ( xNewZipStream ) +, mxZipSeek ( xNewZipStream, UNO_QUERY ) +, maEntry ( rEntry ) , mxData ( rData ) +, maCipher ( NULL ) +, maInflater ( sal_True ) , mbRawStream ( nStreamMode == UNBUFF_STREAM_RAW || nStreamMode == UNBUFF_STREAM_WRAPPEDRAW ) , mbWrappedRaw ( nStreamMode == UNBUFF_STREAM_WRAPPEDRAW ) , mbFinished ( sal_False ) -, mxZipStream ( xNewZipStream ) -, mxZipSeek ( xNewZipStream, UNO_QUERY ) -, maInflater ( sal_True ) -, maCipher ( NULL ) -, mnMyCurrent ( 0 ) +, mnHeaderToRead ( 0 ) +, mnZipCurrent ( 0 ) , mnZipEnd ( 0 ) , mnZipSize ( 0 ) -, mnZipCurrent ( 0 ) -, mnHeaderToRead ( 0 ) +, mnMyCurrent ( 0 ) , mbCheckCRC( !bRecoveryMode ) { mnZipCurrent = maEntry.nOffset; @@ -132,19 +132,19 @@ XUnbufferedStream::XUnbufferedStream( ZipEntry & rEntry, // allows to read package raw stream XUnbufferedStream::XUnbufferedStream( const Reference < XInputStream >& xRawStream, const vos::ORef < EncryptionData > &rData ) -: mxData ( rData ) +: mxZipStream ( xRawStream ) +, mxZipSeek ( xRawStream, UNO_QUERY ) +, mxData ( rData ) +, maCipher ( NULL ) +, maInflater ( sal_True ) , mbRawStream ( sal_False ) , mbWrappedRaw ( sal_False ) , mbFinished ( sal_False ) -, mxZipStream ( xRawStream ) -, mxZipSeek ( xRawStream, UNO_QUERY ) -, maInflater ( sal_True ) -, maCipher ( NULL ) -, mnMyCurrent ( 0 ) +, mnHeaderToRead ( 0 ) +, mnZipCurrent ( 0 ) , mnZipEnd ( 0 ) , mnZipSize ( 0 ) -, mnZipCurrent ( 0 ) -, mnHeaderToRead ( 0 ) +, mnMyCurrent ( 0 ) , mbCheckCRC( sal_False ) { // for this scenario maEntry is not set !!! @@ -191,15 +191,15 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa if ( mbWrappedRaw && mnHeaderToRead ) { - sal_Int16 nHeadRead = static_cast < sal_Int16 > ( nRequestedBytes > mnHeaderToRead ? - mnHeaderToRead : nRequestedBytes ); + sal_Int16 nHeadRead = static_cast< sal_Int16 >(( nRequestedBytes > mnHeaderToRead ? + mnHeaderToRead : nRequestedBytes )); memcpy ( aData.getArray(), maHeader.getConstArray() + maHeader.getLength() - mnHeaderToRead, nHeadRead ); - mnHeaderToRead -= nHeadRead; + mnHeaderToRead = mnHeaderToRead - nHeadRead; if ( nHeadRead < nRequestedBytes ) { sal_Int32 nToRead = nRequestedBytes - nHeadRead; - nToRead = ( nDiff < nToRead ) ? nDiff : nToRead; + nToRead = ( nDiff < nToRead ) ? sal::static_int_cast< sal_Int32 >( nDiff ) : nToRead; Sequence< sal_Int8 > aPureData( nToRead ); mxZipSeek->seek ( mnZipCurrent ); @@ -270,12 +270,15 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa maCRC.update( maCompBuffer ); Sequence < sal_Int8 > aCryptBuffer ( nZipRead ); - rtlCipherError aResult = rtl_cipher_decode ( maCipher, + rtlCipherError aResult = + rtl_cipher_decode ( maCipher, maCompBuffer.getConstArray(), nZipRead, reinterpret_cast < sal_uInt8 * > (aCryptBuffer.getArray()), nZipRead); - OSL_ASSERT (aResult == rtl_Cipher_E_None); + if( aResult != rtl_Cipher_E_None ) { + OSL_ASSERT (aResult == rtl_Cipher_E_None); + } maCompBuffer = aCryptBuffer; // Now it holds the decrypted data } |