From 4038202f89d97caf4d0a0b2d44d4111c4c4b2422 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 26 Apr 2017 14:21:45 -0400
Subject: [PATCH] Avoid a warning from the use of floating-point in zstd
Replace "(preset - 0.5) * 1mb" with "preset * 1mb - 0.5 mb", to
avoid warning about converting double to size_t.
---
src/common/compress_zstd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 4a8f03e30a..40b541247b 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -145,7 +145,8 @@ tor_zstd_state_size_precalc(int compress, int preset)
// variables that are not exposed via the public API. We use a _very_
// simplified function to calculate the estimated amount of bytes used in
// this struct.
- memory_usage += (preset - 0.5) * 1024 * 1024;
+ // memory_usage += (preset - 0.5) * 1024 * 1024;
+ memory_usage += (preset * 1024 * 1024) - (512 * 1024);
// - ZSTD_sizeof_CDict(stream->cdictLocal): Unused in Tor: 0 bytes.
// - stream->outBuffSize: 128 KB:
memory_usage += 128 * 1024;
--
GitLab