From: Danielle Rozenblit <drozenblit@fb.com>
Date: Mon, 17 Oct 2022 15:03:44 +0000 (-0700)
Subject: No longer pass srcSize to minTableLog
X-Git-Tag: v1.5.4^2~141^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3285%2Fhead;p=thirdparty%2Fzstd.git

No longer pass srcSize to minTableLog
---

diff --git a/lib/common/huf.h b/lib/common/huf.h
index d79acd1d5..595b2f6db 100644
--- a/lib/common/huf.h
+++ b/lib/common/huf.h
@@ -190,7 +190,7 @@ typedef enum {
  *  For example, it's possible to compress several blocks using the same 'CTable',
  *  or to save and regenerate 'CTable' using external methods.
  */
-unsigned HUF_minTableLog(size_t srcSize, unsigned symbolCardinality);
+unsigned HUF_minTableLog(unsigned symbolCardinality);
 unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue);
 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); /* table is used as scratch space for building and testing tables, not a return value */
diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c
index 149e09860..e94b398da 100644
--- a/lib/compress/huf_compress.c
+++ b/lib/compress/huf_compress.c
@@ -1247,16 +1247,16 @@ unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue)
     return cardinality;
 }
 
-unsigned HUF_minTableLog(size_t srcSize, unsigned symbolCardinality)
+unsigned HUF_minTableLog(unsigned symbolCardinality)
 {
     U32 minBitsSymbols = ZSTD_highbit32(symbolCardinality) + 1;
-    assert(srcSize > 1); /* Not supported, RLE should be used instead */
     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)
 {
     unsigned optLog = FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1);
+    assert(srcSize > 1); /* Not supported, RLE should be used instead */
 
     if (depthMode == HUF_depth_optimal) { /** Test valid depths and return optimal **/
         BYTE* dst = (BYTE*)workSpace + sizeof(HUF_WriteCTableWksp);
@@ -1268,7 +1268,7 @@ unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxS
 
         if (wkspSize < sizeof(HUF_buildCTable_wksp_tables)) return optLog;
 
-        for (huffLog = HUF_minTableLog(srcSize, symbolCardinality); huffLog <= maxTableLog; huffLog++) {
+        for (huffLog = HUF_minTableLog(symbolCardinality); huffLog <= maxTableLog; huffLog++) {
             maxBits = HUF_buildCTable_wksp(table, count,
                                             maxSymbolValue, huffLog,
                                             workSpace, wkspSize);