Explorar el Código

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.
Nick Mathewson hace 7 años
padre
commit
4038202f89
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2 1
      src/common/compress_zstd.c

+ 2 - 1
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;