From: inikep <inikep@gmail.com>
Date: Fri, 4 Mar 2016 18:52:23 +0000 (+0100)
Subject: code cleanup
X-Git-Tag: v0.6.0^2~17^2~86^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e29caf7d1c5327ff7c2d585d55dec505f53ed325;p=thirdparty%2Fzstd.git

code cleanup
---

diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c
index 8f14ff036..385b99dcb 100644
--- a/lib/zstd_compress.c
+++ b/lib/zstd_compress.c
@@ -731,7 +731,7 @@ MEM_STATIC void ZSTD_storeSeq(seqStore_t* seqStorePtr, size_t litLength, const B
     printf("pos %6u : %3u literals & match %3u bytes at distance %6u \n",
            (U32)(literals - g_start), (U32)litLength, (U32)matchCode+MINMATCH, (U32)offsetCode);
 #endif
-#if ZSTD_OPT_DEBUG >= 3
+#if ZSTD_OPT_DEBUG == 3
     if (offsetCode == 0) seqStorePtr->realRepSum++;
     seqStorePtr->realSeqSum++;
     seqStorePtr->realMatchSum += matchCode;
@@ -1917,11 +1917,12 @@ static size_t ZSTD_compress_generic (ZSTD_CCtx* zc,
     BYTE* const ostart = (BYTE*)dst;
     BYTE* op = ostart;
     const U32 maxDist = 1 << zc->params.windowLog;
+#if ZSTD_OPT_DEBUG == 3
     seqStore_t* ssPtr = &zc->seqStore;
     static U32 priceFunc = 0;
-
     ssPtr->realMatchSum = ssPtr->realLitSum = ssPtr->realSeqSum = ssPtr->realRepSum = 1;
     ssPtr->priceFunc = priceFunc;
+#endif
 
     while (remaining) {
         size_t cSize;
diff --git a/lib/zstd_internal.h b/lib/zstd_internal.h
index 4948e2397..e136a89cc 100644
--- a/lib/zstd_internal.h
+++ b/lib/zstd_internal.h
@@ -206,13 +206,13 @@ typedef struct {
     U32  litLengthSum;
     U32  litSum;
     U32  offCodeSum;
+#if ZSTD_OPT_DEBUG == 3
     U32  realMatchSum;
     U32  realLitSum;
     U32  realSeqSum;
     U32  realRepSum;
-    U32  factor;
-    U32  factor2;
     U32  priceFunc;
+#endif
 } seqStore_t;
 
 seqStore_t ZSTD_copySeqStore(const ZSTD_CCtx* ctx);
diff --git a/lib/zstd_opt.h b/lib/zstd_opt.h
index f6f9acecf..780c5d415 100644
--- a/lib/zstd_opt.h
+++ b/lib/zstd_opt.h
@@ -118,16 +118,12 @@ FORCE_INLINE U32 ZSTD_getPrice(seqStore_t* seqStorePtr, U32 litLength, const BYT
     if (matchLength >= MaxML) matchLength = MaxML;
     price += ZSTD_getLiteralPrice(seqStorePtr, litLength, literals) + ZSTD_highbit(seqStorePtr->matchLengthSum+1) - ZSTD_highbit(seqStorePtr->matchLengthFreq[matchLength]+1);
 
-#if ZSTD_OPT_DEBUG >= 3
+#if ZSTD_OPT_DEBUG == 3
     switch (seqStorePtr->priceFunc) {
         default:
         case 0:
-            return 1 + price + seqStorePtr->factor + ((seqStorePtr->litSum>>5) / seqStorePtr->litLengthSum) + ((seqStorePtr->litSum<<1) / (seqStorePtr->litSum + seqStorePtr->matchSum));
+            return 1 + price + ((seqStorePtr->litSum>>5) / seqStorePtr->litLengthSum) + ((seqStorePtr->litSum<<1) / (seqStorePtr->litSum + seqStorePtr->matchSum));
         case 1:
-            return 1 + price + seqStorePtr->factor + ((seqStorePtr->factor2) ? ((seqStorePtr->litSum>>5) / seqStorePtr->litLengthSum) + ((seqStorePtr->litSum<<1) / (seqStorePtr->litSum + seqStorePtr->matchSum)) : 0);
-        case 2:
-            return 1 + price + seqStorePtr->factor + ((seqStorePtr->factor2) ? ((seqStorePtr->litSum>>4) / seqStorePtr->litLengthSum) + ((seqStorePtr->litSum<<1) / (seqStorePtr->litSum + seqStorePtr->matchSum)) : 0);
-        case 3:
             return 1 + price;
     }
 #else