From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 7 Jul 2020 09:56:32 +0000 (+0200)
Subject: journal/compress: drop "future" code in zstd compression
X-Git-Tag: v246-rc1~17^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ab0f03266a2217d45bff90e6104164ca51cf1ed;p=thirdparty%2Fsystemd.git

journal/compress: drop "future" code in zstd compression

We generally don't include stuff that is not used. This can be
easily ressurected if ever needed.

Fixes CID#1430210.
---

diff --git a/src/journal/compress.c b/src/journal/compress.c
index ec398e0cc10..e6ce64fc652 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -852,8 +852,6 @@ int compress_stream_zstd(int fdf, int fdt, uint64_t max_bytes) {
         size_t in_allocsize, out_allocsize;
         size_t z;
         uint64_t left = max_bytes, in_bytes = 0;
-        /* This can be used in the future to add uncompressed size to the header */
-        uint64_t in_totalsize = 0;
 
         assert(fdf >= 0);
         assert(fdt >= 0);
@@ -867,11 +865,6 @@ int compress_stream_zstd(int fdf, int fdt, uint64_t max_bytes) {
         if (!cctx || !out_buff || !in_buff)
                 return -ENOMEM;
 
-        if (in_totalsize) {
-                z = ZSTD_CCtx_setPledgedSrcSize(cctx, in_totalsize);
-                if (z)
-                        log_debug("Failed to enable ZSTD input size, ignoring: %s", ZSTD_getErrorName(z));
-        }
         z = ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, 1);
         if (ZSTD_isError(z))
                 log_debug("Failed to enable ZSTD checksum, ignoring: %s", ZSTD_getErrorName(z));