diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 11:15:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 14:47:02 +0000 |
| commit | aaeacab4612b6d920795eaf87c81d97afec14dae (patch) | |
| tree | 530c028da40a0dc31a6847096e9385b1d4e9e8aa /package | |
| parent | 6158ae3b8fb25d305eac9021199195cf58b2339d (diff) | |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/xstor/ohierarchyholder.cxx | 2 | ||||
| -rw-r--r-- | package/source/zipapi/ZipFile.cxx | 1 | ||||
| -rw-r--r-- | package/source/zipapi/ZipOutputStream.cxx | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx index d36fd2d23895..bfccbf6449a1 100644 --- a/package/source/xstor/ohierarchyholder.cxx +++ b/package/source/xstor/ohierarchyholder.cxx @@ -192,7 +192,6 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList } else { - sal_Bool bNewElement = sal_False; ::rtl::Reference< OHierarchyElement_Impl > aElement; OHierarchyElementList_Impl::iterator aIter = m_aChildren.find( aNextName ); if ( aIter != m_aChildren.end() ) @@ -200,7 +199,6 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList if ( !aElement.is() ) { - bNewElement = sal_True; uno::Reference< embed::XStorage > xChildStorage = xOwnStor->openStorageElement( aNextName, embed::ElementModes::READWRITE ); if ( !xChildStorage.is() ) diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 22e88553e0e2..a2751b8b5fc0 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -358,6 +358,7 @@ sal_Bool ZipFile::StaticHasValidPassword( const Sequence< sal_Int8 > &aReadBuffe aDigestResult = rtl_digest_getSHA1 ( aDigest, aDigestSeq.getArray(), RTL_DIGEST_LENGTH_SHA1 ); OSL_ASSERT ( aDigestResult == rtl_Digest_E_None ); + (void)aDigestResult; // If we don't have a digest, then we have to assume that the password is correct if ( rData->aDigest.getLength() != 0 && diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 02b66bad182b..1ba30b2cb3d3 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -174,6 +174,7 @@ void SAL_CALL ZipOutputStream::closeEntry( ) reinterpret_cast < sal_uInt8 * > ( pCurrentEncryptData->aDigest.getArray() ), RTL_DIGEST_LENGTH_SHA1 ); OSL_ASSERT( aDigestResult == rtl_Digest_E_None ); + (void)aDigestResult; rtl_digest_destroySHA1 ( aDigest ); } pCurrentEntry = NULL; @@ -260,6 +261,7 @@ void ZipOutputStream::doDeflate() mnDigested = mnDigested + nEat; } OSL_ASSERT( aDigestResult == rtl_Digest_E_None ); + (void)aDigestResult; aEncryptionBuffer.realloc ( nLength ); @@ -267,6 +269,7 @@ void ZipOutputStream::doDeflate() aCipherResult = rtl_cipher_encode ( aCipher, pTmpBuffer, nLength, reinterpret_cast < sal_uInt8 * > (aEncryptionBuffer.getArray()), nLength ); OSL_ASSERT( aCipherResult == rtl_Cipher_E_None ); + (void)aCipherResult; aChucker.WriteBytes( aEncryptionBuffer ); aCRC.update ( aEncryptionBuffer ); |