mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-18 06:03:42 +03:00
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. (cherry picked from commit e0a1d4b049e6991919a0eacd5d96f7f39dc6ddd1)
This commit is contained in:
parent
a75bc935c3
commit
96d1a35b0f
2
README
2
README
@ -148,7 +148,7 @@ REQUIREMENTS:
|
||||
libacl (optional)
|
||||
libselinux (optional)
|
||||
liblzma (optional)
|
||||
liblz4 >= 119 (optional)
|
||||
liblz4 >= 1.3.0 / 130 (optional)
|
||||
libgcrypt (optional)
|
||||
libqrencode (optional)
|
||||
libmicrohttpd (optional)
|
||||
|
@ -1082,6 +1082,7 @@ conf.set10('HAVE_XZ', have)
|
||||
want_lz4 = get_option('lz4')
|
||||
if want_lz4 != 'false' and not fuzzer_build
|
||||
liblz4 = dependency('liblz4',
|
||||
version : '>= 1.3.0',
|
||||
required : want_lz4 == 'true')
|
||||
have = liblz4.found()
|
||||
else
|
||||
|
@ -95,11 +95,7 @@ int compress_blob_lz4(const void *src, uint64_t src_size,
|
||||
if (src_size < 9)
|
||||
return -ENOBUFS;
|
||||
|
||||
#if LZ4_VERSION_NUMBER >= 10700
|
||||
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)
|
||||
return -ENOBUFS;
|
||||
|
||||
|
@ -207,11 +207,7 @@ static void test_lz4_decompress_partial(void) {
|
||||
memset(huge, 'x', HUGE_SIZE);
|
||||
memcpy(huge, "HUGE=", 5);
|
||||
|
||||
#if LZ4_VERSION_NUMBER >= 10700
|
||||
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);
|
||||
compressed = r;
|
||||
log_info("Compressed %i → %zu", HUGE_SIZE, compressed);
|
||||
|
Loading…
x
Reference in New Issue
Block a user