jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

src: minor compress_lzma.cpp cleanups

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2022-11-15 11:59:22 +01:00
parent d31b80da5b
commit 627e733a30
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compress_lzma.cpp
+8 -9
View File
@@ -221,10 +221,10 @@ error:
namespace MyLzma { namespace MyLzma {
struct InStream : public ISequentialInStream, public CMyUnknownImp { struct InStream final : public ISequentialInStream, public CMyUnknownImp {
virtual ~InStream() {} virtual ~InStream() {}
MY_UNKNOWN_IMP MY_UNKNOWN_IMP
const Byte *b_buf; const Byte *b_buf = nullptr;
size_t b_size; size_t b_size;
size_t b_pos; size_t b_pos;
void Init(const Byte *data, size_t size) { void Init(const Byte *data, size_t size) {
@@ -246,10 +246,10 @@ STDMETHODIMP InStream::Read(void *data, UInt32 size, UInt32 *processedSize) {
return S_OK; return S_OK;
} }
struct OutStream : public ISequentialOutStream, public CMyUnknownImp { struct OutStream final : public ISequentialOutStream, public CMyUnknownImp {
virtual ~OutStream() {} virtual ~OutStream() {}
MY_UNKNOWN_IMP MY_UNKNOWN_IMP
Byte *b_buf; Byte *b_buf = nullptr;
size_t b_size; size_t b_size;
size_t b_pos; size_t b_pos;
bool overflow; bool overflow;
@@ -281,11 +281,11 @@ STDMETHODIMP OutStream::Write(const void *data, UInt32 size, UInt32 *processedSi
return overflow ? E_FAIL : S_OK; return overflow ? E_FAIL : S_OK;
} }
struct ProgressInfo : public ICompressProgressInfo, public CMyUnknownImp { struct ProgressInfo final : public ICompressProgressInfo, public CMyUnknownImp {
virtual ~ProgressInfo() {} virtual ~ProgressInfo() {}
MY_UNKNOWN_IMP MY_UNKNOWN_IMP
STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize) override; STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize) override;
upx_callback_p cb; upx_callback_p cb = nullptr;
}; };
STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize) { STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize) {
@@ -322,14 +322,13 @@ int upx_lzma_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
MyLzma::InStream is; MyLzma::InStream is;
is.AddRef(); is.AddRef();
is.Init(src, src_len);
MyLzma::OutStream os; MyLzma::OutStream os;
os.AddRef(); os.AddRef();
is.Init(src, src_len);
os.Init(dst, *dst_len); os.Init(dst, *dst_len);
MyLzma::ProgressInfo progress; MyLzma::ProgressInfo progress;
progress.AddRef(); progress.AddRef();
progress.cb = cb; progress.cb = cb; // progress.Init()
NCompress::NLZMA::CEncoder enc; NCompress::NLZMA::CEncoder enc;
const PROPID propIDs[8] = { const PROPID propIDs[8] = {