Drop support for lz4 < 1.3.0
lz4-r130 was released on May 29th, 2015. Let's drop the work-around for older versions. In particular, we won't test any new code against those ancient releases, so we shouldn't pretend they are supported.
This commit is contained in:
parent
2b68626089
commit
e0a1d4b049
2
README
2
README
|
@ -148,7 +148,7 @@ REQUIREMENTS:
|
||||||
libacl (optional)
|
libacl (optional)
|
||||||
libselinux (optional)
|
libselinux (optional)
|
||||||
liblzma (optional)
|
liblzma (optional)
|
||||||
liblz4 >= 119 (optional)
|
liblz4 >= 1.3.0 / 130 (optional)
|
||||||
libgcrypt (optional)
|
libgcrypt (optional)
|
||||||
libqrencode (optional)
|
libqrencode (optional)
|
||||||
libmicrohttpd (optional)
|
libmicrohttpd (optional)
|
||||||
|
|
|
@ -1092,6 +1092,7 @@ conf.set10('HAVE_XZ', have)
|
||||||
want_lz4 = get_option('lz4')
|
want_lz4 = get_option('lz4')
|
||||||
if want_lz4 != 'false' and not fuzzer_build
|
if want_lz4 != 'false' and not fuzzer_build
|
||||||
liblz4 = dependency('liblz4',
|
liblz4 = dependency('liblz4',
|
||||||
|
version : '>= 1.3.0',
|
||||||
required : want_lz4 == 'true')
|
required : want_lz4 == 'true')
|
||||||
have = liblz4.found()
|
have = liblz4.found()
|
||||||
else
|
else
|
||||||
|
|
|
@ -95,11 +95,7 @@ int compress_blob_lz4(const void *src, uint64_t src_size,
|
||||||
if (src_size < 9)
|
if (src_size < 9)
|
||||||
return -ENOBUFS;
|
return -ENOBUFS;
|
||||||
|
|
||||||
#if LZ4_VERSION_NUMBER >= 10700
|
|
||||||
r = LZ4_compress_default(src, (char*)dst + 8, src_size, (int) dst_alloc_size - 8);
|
r = LZ4_compress_default(src, (char*)dst + 8, src_size, (int) dst_alloc_size - 8);
|
||||||
#else
|
|
||||||
r = LZ4_compress_limitedOutput(src, (char*)dst + 8, src_size, (int) dst_alloc_size - 8);
|
|
||||||
#endif
|
|
||||||
if (r <= 0)
|
if (r <= 0)
|
||||||
return -ENOBUFS;
|
return -ENOBUFS;
|
||||||
|
|
||||||
|
|
|
@ -208,11 +208,7 @@ static void test_lz4_decompress_partial(void) {
|
||||||
memset(huge, 'x', HUGE_SIZE);
|
memset(huge, 'x', HUGE_SIZE);
|
||||||
memcpy(huge, "HUGE=", 5);
|
memcpy(huge, "HUGE=", 5);
|
||||||
|
|
||||||
#if LZ4_VERSION_NUMBER >= 10700
|
|
||||||
r = LZ4_compress_default(huge, buf, HUGE_SIZE, buf_size);
|
r = LZ4_compress_default(huge, buf, HUGE_SIZE, buf_size);
|
||||||
#else
|
|
||||||
r = LZ4_compress_limitedOutput(huge, buf, HUGE_SIZE, buf_size);
|
|
||||||
#endif
|
|
||||||
assert_se(r >= 0);
|
assert_se(r >= 0);
|
||||||
compressed = r;
|
compressed = r;
|
||||||
log_info("Compressed %i → %zu", HUGE_SIZE, compressed);
|
log_info("Compressed %i → %zu", HUGE_SIZE, compressed);
|
||||||
|
|
Loading…
Reference in New Issue