diff options
Diffstat (limited to '7zip/Archive/Zip/ZipIn.cpp')
-rwxr-xr-x | 7zip/Archive/Zip/ZipIn.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/7zip/Archive/Zip/ZipIn.cpp b/7zip/Archive/Zip/ZipIn.cpp index 4b4481ed..59f1e0ae 100755 --- a/7zip/Archive/Zip/ZipIn.cpp +++ b/7zip/Archive/Zip/ZipIn.cpp @@ -7,6 +7,7 @@ #include "Common/StringConvert.h" #include "Common/DynamicBuffer.h" #include "../../Common/LimitedStreams.h" +#include "../../Common/StreamUtils.h" namespace NArchive { namespace NZip { @@ -87,13 +88,10 @@ bool CInArchive::FindAndReadMarker(const UInt64 *searchHeaderSizeLimit) } } -////////////////////////////////////// -// Read Operations - HRESULT CInArchive::ReadBytes(void *data, UInt32 size, UInt32 *processedSize) { UInt32 realProcessedSize; - HRESULT result = m_Stream->Read(data, size, &realProcessedSize); + HRESULT result = ReadStream(m_Stream, data, size, &realProcessedSize); if(processedSize != NULL) *processedSize = realProcessedSize; m_Position += realProcessedSize; @@ -158,9 +156,6 @@ UInt64 CInArchive::ReadUInt64() return value; } -////////////////////////////////// -// Read headers - bool CInArchive::ReadUInt32(UInt32 &value) { value = 0; |