diff options
Diffstat (limited to 'util/cbfstool/lzma/C/7zip/Common')
-rw-r--r-- | util/cbfstool/lzma/C/7zip/Common/InBuffer.h | 2 | ||||
-rw-r--r-- | util/cbfstool/lzma/C/7zip/Common/OutBuffer.cpp | 4 | ||||
-rw-r--r-- | util/cbfstool/lzma/C/7zip/Common/OutBuffer.h | 2 | ||||
-rw-r--r-- | util/cbfstool/lzma/C/7zip/Common/StdAfx.h | 2 | ||||
-rw-r--r-- | util/cbfstool/lzma/C/7zip/Common/StreamUtils.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/util/cbfstool/lzma/C/7zip/Common/InBuffer.h b/util/cbfstool/lzma/C/7zip/Common/InBuffer.h index 057caa1659..bfa4bc968b 100644 --- a/util/cbfstool/lzma/C/7zip/Common/InBuffer.h +++ b/util/cbfstool/lzma/C/7zip/Common/InBuffer.h @@ -38,7 +38,7 @@ public: bool Create(UInt32 bufferSize); void Free(); - + void SetStream(ISequentialInStream *stream); void Init(); void ReleaseStream() { _stream.Release(); } diff --git a/util/cbfstool/lzma/C/7zip/Common/OutBuffer.cpp b/util/cbfstool/lzma/C/7zip/Common/OutBuffer.cpp index a73fa7c5b9..b4c8b7ee48 100644 --- a/util/cbfstool/lzma/C/7zip/Common/OutBuffer.cpp +++ b/util/cbfstool/lzma/C/7zip/Common/OutBuffer.cpp @@ -43,9 +43,9 @@ void COutBuffer::Init() } UInt64 COutBuffer::GetProcessedSize() const -{ +{ UInt64 res = _processedSize + _pos - _streamPos; - if (_streamPos > _pos) + if (_streamPos > _pos) res += _bufferSize; return res; } diff --git a/util/cbfstool/lzma/C/7zip/Common/OutBuffer.h b/util/cbfstool/lzma/C/7zip/Common/OutBuffer.h index 0ce54e21e6..659368be30 100644 --- a/util/cbfstool/lzma/C/7zip/Common/OutBuffer.h +++ b/util/cbfstool/lzma/C/7zip/Common/OutBuffer.h @@ -36,7 +36,7 @@ public: COutBuffer(): _buffer(0), _pos(0), _stream(0), _buffer2(0) {} ~COutBuffer() { Free(); } - + bool Create(UInt32 bufferSize); void Free(); diff --git a/util/cbfstool/lzma/C/7zip/Common/StdAfx.h b/util/cbfstool/lzma/C/7zip/Common/StdAfx.h index 27a77b104b..ef555ec12a 100644 --- a/util/cbfstool/lzma/C/7zip/Common/StdAfx.h +++ b/util/cbfstool/lzma/C/7zip/Common/StdAfx.h @@ -6,4 +6,4 @@ #include "../../Common/MyWindows.h" #include "../../Common/NewHandler.h" -#endif +#endif diff --git a/util/cbfstool/lzma/C/7zip/Common/StreamUtils.cpp b/util/cbfstool/lzma/C/7zip/Common/StreamUtils.cpp index a5d9ac0ef0..f5d2da5b55 100644 --- a/util/cbfstool/lzma/C/7zip/Common/StreamUtils.cpp +++ b/util/cbfstool/lzma/C/7zip/Common/StreamUtils.cpp @@ -11,7 +11,7 @@ HRESULT ReadStream(ISequentialInStream *stream, void *data, UInt32 size, UInt32 *processedSize = 0; while(size != 0) { - UInt32 processedSizeLoc; + UInt32 processedSizeLoc; HRESULT res = stream->Read(data, size, &processedSizeLoc); if (processedSize != 0) *processedSize += processedSizeLoc; @@ -30,7 +30,7 @@ HRESULT WriteStream(ISequentialOutStream *stream, const void *data, UInt32 size, *processedSize = 0; while(size != 0) { - UInt32 processedSizeLoc; + UInt32 processedSizeLoc; HRESULT res = stream->Write(data, size, &processedSizeLoc); if (processedSize != 0) *processedSize += processedSizeLoc; |