From: Danielle Rozenblit Date: Mon, 17 Oct 2022 14:55:07 +0000 (-0700) Subject: Minor simplication: no longer need to check src size if using cardinality for minTableLog X-Git-Tag: v1.5.4^2~141^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b34729018cd4a38d8e3efdc604d30ec9c3081f24;p=thirdparty%2Fzstd.git Minor simplication: no longer need to check src size if using cardinality for minTableLog --- diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c index 54b58f191..149e09860 100644 --- a/lib/compress/huf_compress.c +++ b/lib/compress/huf_compress.c @@ -1249,11 +1249,9 @@ unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue) unsigned HUF_minTableLog(size_t srcSize, unsigned symbolCardinality) { - U32 minBitsSrc = ZSTD_highbit32((U32)(srcSize)) + 1; U32 minBitsSymbols = ZSTD_highbit32(symbolCardinality) + 1; - U32 minBits = minBitsSrc < minBitsSymbols ? minBitsSrc : minBitsSymbols; assert(srcSize > 1); /* Not supported, RLE should be used instead */ - return minBits; + return minBitsSymbols; } unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace, size_t wkspSize, HUF_CElt* table, const unsigned* count, HUF_depth_mode depthMode)