Restoring authorship annotation for Ruslan Kovalev <ruslan.a.kovalev@gmail.com>. Commit 2 of 2.

1 files changed, 133 insertions, 133 deletions

diff --git a/contrib/libs/zstd/lib/common/entropy_common.c b/contrib/libs/zstd/lib/common/entropy_common.c
index 19953650d6..4229b40c5e 100644
--- a/contrib/libs/zstd/lib/common/entropy_common.c
+++ b/contrib/libs/zstd/lib/common/entropy_common.c
@@ -11,35 +11,35 @@
  * in the COPYING file in the root directory of this source tree).
  * You may select, at your option, one of the above-listed licenses.
 ****************************************************************** */
- 
-/* ************************************* 
-*  Dependencies 
-***************************************/ 
-#include "mem.h" 
-#include "error_private.h"       /* ERR_*, ERROR */ 
-#define FSE_STATIC_LINKING_ONLY  /* FSE_MIN_TABLELOG */ 
-#include "fse.h" 
-#define HUF_STATIC_LINKING_ONLY  /* HUF_TABLELOG_ABSOLUTEMAX */ 
-#include "huf.h" 
- 
- 
+
+/* *************************************
+*  Dependencies
+***************************************/
+#include "mem.h"
+#include "error_private.h"       /* ERR_*, ERROR */
+#define FSE_STATIC_LINKING_ONLY  /* FSE_MIN_TABLELOG */
+#include "fse.h"
+#define HUF_STATIC_LINKING_ONLY  /* HUF_TABLELOG_ABSOLUTEMAX */
+#include "huf.h"
+
+
 /*===   Version   ===*/
 unsigned FSE_versionNumber(void) { return FSE_VERSION_NUMBER; }
 
 
 /*===   Error Management   ===*/
 unsigned FSE_isError(size_t code) { return ERR_isError(code); }
-const char* FSE_getErrorName(size_t code) { return ERR_getErrorName(code); } 
- 
-unsigned HUF_isError(size_t code) { return ERR_isError(code); } 
-const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); } 
- 
- 
-/*-************************************************************** 
-*  FSE NCount encoding-decoding 
-****************************************************************/ 
+const char* FSE_getErrorName(size_t code) { return ERR_getErrorName(code); }
+
+unsigned HUF_isError(size_t code) { return ERR_isError(code); }
+const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); }
+
+
+/*-**************************************************************
+*  FSE NCount encoding-decoding
+****************************************************************/
 static U32 FSE_ctz(U32 val)
-{ 
+{
     assert(val != 0);
     {
 #   if defined(_MSC_VER)   /* Visual */
@@ -70,18 +70,18 @@ FORCE_INLINE_TEMPLATE
 size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
                            const void* headerBuffer, size_t hbSize)
 {
-    const BYTE* const istart = (const BYTE*) headerBuffer; 
-    const BYTE* const iend = istart + hbSize; 
-    const BYTE* ip = istart; 
-    int nbBits; 
-    int remaining; 
-    int threshold; 
-    U32 bitStream; 
-    int bitCount; 
-    unsigned charnum = 0; 
+    const BYTE* const istart = (const BYTE*) headerBuffer;
+    const BYTE* const iend = istart + hbSize;
+    const BYTE* ip = istart;
+    int nbBits;
+    int remaining;
+    int threshold;
+    U32 bitStream;
+    int bitCount;
+    unsigned charnum = 0;
     unsigned const maxSV1 = *maxSVPtr + 1;
-    int previous0 = 0; 
- 
+    int previous0 = 0;
+
     if (hbSize < 8) {
         /* This function only works when hbSize >= 8 */
         char buffer[8] = {0};
@@ -96,18 +96,18 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
 
     /* init */
     ZSTD_memset(normalizedCounter, 0, (*maxSVPtr+1) * sizeof(normalizedCounter[0]));   /* all symbols not present in NCount have a frequency of 0 */
-    bitStream = MEM_readLE32(ip); 
-    nbBits = (bitStream & 0xF) + FSE_MIN_TABLELOG;   /* extract tableLog */ 
-    if (nbBits > FSE_TABLELOG_ABSOLUTE_MAX) return ERROR(tableLog_tooLarge); 
-    bitStream >>= 4; 
-    bitCount = 4; 
-    *tableLogPtr = nbBits; 
-    remaining = (1<<nbBits)+1; 
-    threshold = 1<<nbBits; 
-    nbBits++; 
- 
+    bitStream = MEM_readLE32(ip);
+    nbBits = (bitStream & 0xF) + FSE_MIN_TABLELOG;   /* extract tableLog */
+    if (nbBits > FSE_TABLELOG_ABSOLUTE_MAX) return ERROR(tableLog_tooLarge);
+    bitStream >>= 4;
+    bitCount = 4;
+    *tableLogPtr = nbBits;
+    remaining = (1<<nbBits)+1;
+    threshold = 1<<nbBits;
+    nbBits++;
+
     for (;;) {
-        if (previous0) { 
+        if (previous0) {
             /* Count the number of repeats. Each time the
              * 2-bit repeat code is 0b11 there is another
              * repeat.
@@ -118,14 +118,14 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
                 charnum += 3 * 12;
                 if (LIKELY(ip <= iend-7)) {
                     ip += 3;
-                } else { 
+                } else {
                     bitCount -= (int)(8 * (iend - 7 - ip));
                     bitCount &= 31;
                     ip = iend - 4;
                 }
                 bitStream = MEM_readLE32(ip) >> bitCount;
                 repeats = FSE_ctz(~bitStream | 0x80000000) >> 1;
-            } 
+            }
             charnum += 3 * repeats;
             bitStream >>= 2 * repeats;
             bitCount += 2 * repeats;
@@ -133,7 +133,7 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
             /* Add the final repeat which isn't 0b11. */
             assert((bitStream & 3) < 3);
             charnum += bitStream & 3;
-            bitCount += 2; 
+            bitCount += 2;
 
             /* This is an error, but break and return an error
              * at the end, because returning out of a loop makes
@@ -147,9 +147,9 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
 
             if (LIKELY(ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) {
                 assert((bitCount >> 3) <= 3); /* For first condition to work */
-                ip += bitCount>>3; 
-                bitCount &= 7; 
-            } else { 
+                ip += bitCount>>3;
+                bitCount &= 7;
+            } else {
                 bitCount -= (int)(8 * (iend - 4 - ip));
                 bitCount &= 31;
                 ip = iend - 4;
@@ -159,17 +159,17 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
         {
             int const max = (2*threshold-1) - remaining;
             int count;
- 
-            if ((bitStream & (threshold-1)) < (U32)max) { 
+
+            if ((bitStream & (threshold-1)) < (U32)max) {
                 count = bitStream & (threshold-1);
                 bitCount += nbBits-1;
-            } else { 
+            } else {
                 count = bitStream & (2*threshold-1);
-                if (count >= threshold) count -= max; 
+                if (count >= threshold) count -= max;
                 bitCount += nbBits;
-            } 
- 
-            count--;   /* extra accuracy */ 
+            }
+
+            count--;   /* extra accuracy */
             /* When it matters (small blocks), this is a
              * predictable branch, because we don't use -1.
              */
@@ -180,7 +180,7 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
                 remaining += count;
             }
             normalizedCounter[charnum++] = (short)count;
-            previous0 = !count; 
+            previous0 = !count;
 
             assert(threshold > 1);
             if (remaining < threshold) {
@@ -191,29 +191,29 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
                 if (remaining <= 1) break;
                 nbBits = BIT_highbit32(remaining) + 1;
                 threshold = 1 << (nbBits - 1);
-            } 
+            }
             if (charnum >= maxSV1) break;
- 
+
             if (LIKELY(ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) {
-                ip += bitCount>>3; 
-                bitCount &= 7; 
-            } else { 
-                bitCount -= (int)(8 * (iend - 4 - ip)); 
+                ip += bitCount>>3;
+                bitCount &= 7;
+            } else {
+                bitCount -= (int)(8 * (iend - 4 - ip));
                 bitCount &= 31;
-                ip = iend - 4; 
-            } 
+                ip = iend - 4;
+            }
             bitStream = MEM_readLE32(ip) >> bitCount;
     }   }
-    if (remaining != 1) return ERROR(corruption_detected); 
+    if (remaining != 1) return ERROR(corruption_detected);
     /* Only possible when there are too many zeros. */
     if (charnum > maxSV1) return ERROR(maxSymbolValue_tooSmall);
-    if (bitCount > 32) return ERROR(corruption_detected); 
-    *maxSVPtr = charnum-1; 
- 
-    ip += (bitCount+7)>>3; 
-    return ip-istart; 
-} 
- 
+    if (bitCount > 32) return ERROR(corruption_detected);
+    *maxSVPtr = charnum-1;
+
+    ip += (bitCount+7)>>3;
+    return ip-istart;
+}
+
 /* Avoids the FORCE_INLINE of the _body() function. */
 static size_t FSE_readNCount_body_default(
         short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
@@ -221,7 +221,7 @@ static size_t FSE_readNCount_body_default(
 {
     return FSE_readNCount_body(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize);
 }
- 
+
 #if DYNAMIC_BMI2
 BMI2_TARGET_ATTRIBUTE static size_t FSE_readNCount_body_bmi2(
         short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
@@ -252,17 +252,17 @@ size_t FSE_readNCount(
 }
 
 
-/*! HUF_readStats() : 
-    Read compact Huffman tree, saved by HUF_writeCTable(). 
-    `huffWeight` is destination buffer. 
+/*! HUF_readStats() :
+    Read compact Huffman tree, saved by HUF_writeCTable().
+    `huffWeight` is destination buffer.
     `rankStats` is assumed to be a table of at least HUF_TABLELOG_MAX U32.
-    @return : size read from `src` , or an error Code . 
-    Note : Needed by HUF_readCTable() and HUF_readDTableX?() . 
-*/ 
-size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats, 
-                     U32* nbSymbolsPtr, U32* tableLogPtr, 
-                     const void* src, size_t srcSize) 
-{ 
+    @return : size read from `src` , or an error Code .
+    Note : Needed by HUF_readCTable() and HUF_readDTableX?() .
+*/
+size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats,
+                     U32* nbSymbolsPtr, U32* tableLogPtr,
+                     const void* src, size_t srcSize)
+{
     U32 wksp[HUF_READ_STATS_WORKSPACE_SIZE_U32];
     return HUF_readStats_wksp(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, wksp, sizeof(wksp), /* bmi2 */ 0);
 }
@@ -274,64 +274,64 @@ HUF_readStats_body(BYTE* huffWeight, size_t hwSize, U32* rankStats,
                    void* workSpace, size_t wkspSize,
                    int bmi2)
 {
-    U32 weightTotal; 
-    const BYTE* ip = (const BYTE*) src; 
+    U32 weightTotal;
+    const BYTE* ip = (const BYTE*) src;
     size_t iSize;
-    size_t oSize; 
- 
+    size_t oSize;
+
     if (!srcSize) return ERROR(srcSize_wrong);
     iSize = ip[0];
     /* ZSTD_memset(huffWeight, 0, hwSize);   *//* is not necessary, even though some analyzer complain ... */
- 
-    if (iSize >= 128) {  /* special header */ 
-        oSize = iSize - 127; 
-        iSize = ((oSize+1)/2); 
-        if (iSize+1 > srcSize) return ERROR(srcSize_wrong); 
-        if (oSize >= hwSize) return ERROR(corruption_detected); 
-        ip += 1; 
-        {   U32 n; 
-            for (n=0; n<oSize; n+=2) { 
-                huffWeight[n]   = ip[n/2] >> 4; 
-                huffWeight[n+1] = ip[n/2] & 15; 
-    }   }   } 
-    else  {   /* header compressed with FSE (normal case) */ 
-        if (iSize+1 > srcSize) return ERROR(srcSize_wrong); 
+
+    if (iSize >= 128) {  /* special header */
+        oSize = iSize - 127;
+        iSize = ((oSize+1)/2);
+        if (iSize+1 > srcSize) return ERROR(srcSize_wrong);
+        if (oSize >= hwSize) return ERROR(corruption_detected);
+        ip += 1;
+        {   U32 n;
+            for (n=0; n<oSize; n+=2) {
+                huffWeight[n]   = ip[n/2] >> 4;
+                huffWeight[n+1] = ip[n/2] & 15;
+    }   }   }
+    else  {   /* header compressed with FSE (normal case) */
+        if (iSize+1 > srcSize) return ERROR(srcSize_wrong);
         /* max (hwSize-1) values decoded, as last one is implied */
         oSize = FSE_decompress_wksp_bmi2(huffWeight, hwSize-1, ip+1, iSize, 6, workSpace, wkspSize, bmi2);
-        if (FSE_isError(oSize)) return oSize; 
-    } 
- 
-    /* collect weight stats */ 
+        if (FSE_isError(oSize)) return oSize;
+    }
+
+    /* collect weight stats */
     ZSTD_memset(rankStats, 0, (HUF_TABLELOG_MAX + 1) * sizeof(U32));
-    weightTotal = 0; 
-    {   U32 n; for (n=0; n<oSize; n++) { 
+    weightTotal = 0;
+    {   U32 n; for (n=0; n<oSize; n++) {
             if (huffWeight[n] > HUF_TABLELOG_MAX) return ERROR(corruption_detected);
-            rankStats[huffWeight[n]]++; 
-            weightTotal += (1 << huffWeight[n]) >> 1; 
-    }   } 
+            rankStats[huffWeight[n]]++;
+            weightTotal += (1 << huffWeight[n]) >> 1;
+    }   }
     if (weightTotal == 0) return ERROR(corruption_detected);
- 
-    /* get last non-null symbol weight (implied, total must be 2^n) */ 
-    {   U32 const tableLog = BIT_highbit32(weightTotal) + 1; 
+
+    /* get last non-null symbol weight (implied, total must be 2^n) */
+    {   U32 const tableLog = BIT_highbit32(weightTotal) + 1;
         if (tableLog > HUF_TABLELOG_MAX) return ERROR(corruption_detected);
-        *tableLogPtr = tableLog; 
-        /* determine last weight */ 
-        {   U32 const total = 1 << tableLog; 
-            U32 const rest = total - weightTotal; 
-            U32 const verif = 1 << BIT_highbit32(rest); 
-            U32 const lastWeight = BIT_highbit32(rest) + 1; 
-            if (verif != rest) return ERROR(corruption_detected);    /* last value must be a clean power of 2 */ 
-            huffWeight[oSize] = (BYTE)lastWeight; 
-            rankStats[lastWeight]++; 
-    }   } 
- 
-    /* check tree construction validity */ 
-    if ((rankStats[1] < 2) || (rankStats[1] & 1)) return ERROR(corruption_detected);   /* by construction : at least 2 elts of rank 1, must be even */ 
- 
-    /* results */ 
-    *nbSymbolsPtr = (U32)(oSize+1); 
-    return iSize+1; 
-} 
+        *tableLogPtr = tableLog;
+        /* determine last weight */
+        {   U32 const total = 1 << tableLog;
+            U32 const rest = total - weightTotal;
+            U32 const verif = 1 << BIT_highbit32(rest);
+            U32 const lastWeight = BIT_highbit32(rest) + 1;
+            if (verif != rest) return ERROR(corruption_detected);    /* last value must be a clean power of 2 */
+            huffWeight[oSize] = (BYTE)lastWeight;
+            rankStats[lastWeight]++;
+    }   }
+
+    /* check tree construction validity */
+    if ((rankStats[1] < 2) || (rankStats[1] & 1)) return ERROR(corruption_detected);   /* by construction : at least 2 elts of rank 1, must be even */
+
+    /* results */
+    *nbSymbolsPtr = (U32)(oSize+1);
+    return iSize+1;
+}
 
 /* Avoids the FORCE_INLINE of the _body() function. */
 static size_t HUF_readStats_body_default(BYTE* huffWeight, size_t hwSize, U32* rankStats,