diff options
Diffstat (limited to '7zip/Archive/Common/MultiStream.cpp')
| -rwxr-xr-x | 7zip/Archive/Common/MultiStream.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/7zip/Archive/Common/MultiStream.cpp b/7zip/Archive/Common/MultiStream.cpp index cdcb8886..7ef4f155 100755 --- a/7zip/Archive/Common/MultiStream.cpp +++ b/7zip/Archive/Common/MultiStream.cpp @@ -28,17 +28,11 @@ STDMETHODIMP CMultiStream::Read(void *data, UInt32 size, UInt32 *processedSize) _pos += realProcessed; _seekPos += realProcessed; RINOK(result); - if (realProcessed == 0) - break; + break; } return S_OK; } -STDMETHODIMP CMultiStream::ReadPart(void *data, UInt32 size, UInt32 *processedSize) -{ - return Read(data, size, processedSize); -} - STDMETHODIMP CMultiStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) { @@ -113,7 +107,6 @@ public: HRESULT Flush(); STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize); - STDMETHOD(WritePart)(const void *data, UInt32 size, UInt32 *processedSize); }; HRESULT COutVolumeStream::Flush() @@ -179,17 +172,12 @@ STDMETHODIMP COutMultiStream::Write(const void *data, UInt32 size, UInt32 *proce _streamIndex++; _offsetPos = 0; } - if (realProcessed != curSize) + if (realProcessed != curSize && realProcessed == 0) return E_FAIL; } return S_OK; } -STDMETHODIMP COutMultiStream::WritePart(const void *data, UInt32 size, UInt32 *processedSize) -{ - return Write(data, size, processedSize); -} - STDMETHODIMP COutMultiStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) { if(seekOrigin >= 3) |