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

Ongoing cleanups and cruft removal.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2016-09-21 16:42:25 +02:00
parent d2830db94d
commit 3bb654cc85
14 changed files with 221 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compress.cpp
+6 -11
View File
@@ -29,7 +29,6 @@
#include "conf.h"
#include "compress.h"
#include "mem.h"
#include <zlib.h>
/*************************************************************************
@@ -41,12 +40,10 @@ unsigned upx_adler32(const void *buf, unsigned len, unsigned adler)
if (len == 0)
return adler;
assert(buf != NULL);
#if 0
return adler32(adler, (const Bytef *) buf, len); // zlib
#elif (WITH_UCL)
return ucl_adler32(adler, (const ucl_bytep) buf, len);
#if 1
return upx_ucl_adler32(buf, len, adler);
#else
# error
return upx_zlib_adler32(buf, len, adler);
#endif
}
@@ -57,12 +54,10 @@ unsigned upx_crc32(const void *buf, unsigned len, unsigned crc)
if (len == 0)
return crc;
assert(buf != NULL);
#if 0
return crc32(crc, (const Bytef *) buf, len); // zlib
#elif (WITH_UCL)
return ucl_crc32(crc, (const ucl_bytep) buf, len);
#if 1
return upx_ucl_crc32(buf, len, crc);
#else
# error
return upx_zlib_crc32(buf, len, crc);
#endif
}
#endif /* UNUSED */