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

Use a MemBuffer instead of a pointer.

Browse Source 
committer: mfx <mfx> 1043693800 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2003-01-27 18:56:40 +00:00
parent fd525ae7df
commit 51c28020de
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/packer.cpp
+8 -7
View File
@@ -1257,7 +1257,7 @@ void Packer::compressWithFilters(Filter *parm_ft,
ui_total_passes += nfilters * nmethods; ui_total_passes += nfilters * nmethods;
// Working buffer for compressed data. Don't waste memory. // Working buffer for compressed data. Don't waste memory.
upx_byte *otemp = obuf; MemBuffer *otemp = &obuf;
MemBuffer otemp_buf; MemBuffer otemp_buf;
// compress // compress
@@ -1300,22 +1300,22 @@ void Packer::compressWithFilters(Filter *parm_ft,
printf("filter: id 0x%02x size %6d, calls %5d/%5d/%3d/%5d/%5d, cto 0x%02x\n", printf("filter: id 0x%02x size %6d, calls %5d/%5d/%3d/%5d/%5d, cto 0x%02x\n",
ft.id, ft.buf_len, ft.calls, ft.noncalls, ft.wrongcalls, ft.firstcall, ft.lastcall, ft.cto); ft.id, ft.buf_len, ft.calls, ft.noncalls, ft.wrongcalls, ft.firstcall, ft.lastcall, ft.cto);
#endif #endif
if (nfilters_success > 0 && otemp == obuf) if (nfilters_success > 0 && otemp == &obuf)
{ {
otemp_buf.allocForCompression(compress_buf_len); otemp_buf.allocForCompression(compress_buf_len);
otemp = otemp_buf; otemp = &otemp_buf;
} }
nfilters_success++; nfilters_success++;
ph.filter_cto = ft.cto; ph.filter_cto = ft.cto;
ph.n_mru = ft.n_mru; ph.n_mru = ft.n_mru;
// compress // compress
if (compress(ibuf + compress_buf_off, otemp, max_offset, max_match)) if (compress(ibuf + compress_buf_off, *otemp, max_offset, max_match))
{ {
unsigned lsize = 0; unsigned lsize = 0;
if (ph.c_len + lsize < best_ph.c_len + best_ph_lsize) if (ph.c_len + lsize < best_ph.c_len + best_ph_lsize)
{ {
// get results // get results
ph.overlap_overhead = findOverlapOverhead(otemp, overlap_range); ph.overlap_overhead = findOverlapOverhead(*otemp, overlap_range);
lsize = buildLoader(&ft); lsize = buildLoader(&ft);
} }
#if 0 #if 0
@@ -1341,8 +1341,8 @@ void Packer::compressWithFilters(Filter *parm_ft,
if (update) if (update)
{ {
// update obuf[] with best version // update obuf[] with best version
if (otemp != obuf) if (otemp != &obuf)
memcpy(obuf, otemp, ph.c_len); memcpy(obuf, *otemp, ph.c_len);
// save compression results // save compression results
best_ph = ph; best_ph = ph;
best_ph_lsize = lsize; best_ph_lsize = lsize;
@@ -1354,6 +1354,7 @@ void Packer::compressWithFilters(Filter *parm_ft,
// //
ibuf.checkState(); ibuf.checkState();
obuf.checkState(); obuf.checkState();
otemp->checkState();
// //
if (strategy < 0) if (strategy < 0)
break; break;