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

Remove implicit magic from OptVar copy operator and introduce oassign()

Browse Source 
function instead.
This commit is contained in:
Markus F.X.J. Oberhumer
2006-11-20 11:04:31 +01:00
parent 4dfe9d52e9
commit 03e891c0e8
5 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/packer.cpp
+5 -6
View File
@@ -191,12 +191,11 @@ bool Packer::compress(upx_bytep in, upx_bytep out,
}
if (M_IS_LZMA(ph.method))
{
// NOTE: these are _optional_ assignments which query OptVar::is_set !
cconf.conf_lzma.pos_bits = opt->crp.crp_lzma.pos_bits;
cconf.conf_lzma.lit_pos_bits = opt->crp.crp_lzma.lit_pos_bits;
cconf.conf_lzma.lit_context_bits = opt->crp.crp_lzma.lit_context_bits;
cconf.conf_lzma.dict_size = opt->crp.crp_lzma.dict_size;
cconf.conf_lzma.num_fast_bytes = opt->crp.crp_lzma.num_fast_bytes;
oassign(cconf.conf_lzma.pos_bits, opt->crp.crp_lzma.pos_bits);
oassign(cconf.conf_lzma.lit_pos_bits, opt->crp.crp_lzma.lit_pos_bits);
oassign(cconf.conf_lzma.lit_context_bits, opt->crp.crp_lzma.lit_context_bits);
oassign(cconf.conf_lzma.dict_size, opt->crp.crp_lzma.dict_size);
oassign(cconf.conf_lzma.num_fast_bytes, opt->crp.crp_lzma.num_fast_bytes);
}
if (uip->ui_pass >= 0)
uip->ui_pass++;