[linux-kernel] Fix some up clang-format edge cases

diff --git a/contrib/linux-kernel/kernelize.sh b/contrib/linux-kernel/kernelize.sh
index 35ef5ed9f2b771c59f2c82fde88950843eac5d33..21aa2ecdcd1f1a9295d65eb1bc5a0d6a04ac0021 100755 (executable)
--- a/contrib/linux-kernel/kernelize.sh
+++ b/contrib/linux-kernel/kernelize.sh
@@ -96,6 +96,7 @@ then
   check_not_present_in_file STATIC_ASSERT ${LIB}mem.h
   check_not_present_in_file "#define ZSTD_STATIC_ASSERT" ${LIB}compress.c
   check_not_present MEM_STATIC
+  check_not_present FSE_COMMONDEFS_ONLY
   check_not_present "#if 0"
   check_not_present "#if 1"
   check_not_present _MSC_VER

diff --git a/contrib/linux-kernel/lib/zstd/compress.c b/contrib/linux-kernel/lib/zstd/compress.c
index 39b8c3b8f9c963060932a09c7300f1d0db7f6297..f2940a146f5fa2a98ebb5df32c2aafb6f14f5b59 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/compress.c
+++ b/contrib/linux-kernel/lib/zstd/compress.c
@@ -2412,9 +2412,8 @@ static size_t ZSTD_writeFrameHeader(void *dst, size_t dstCapacity, ZSTD_paramete
        U32 const windowSize = 1U << params.cParams.windowLog;
        U32 const singleSegment = params.fParams.contentSizeFlag && (windowSize >= pledgedSrcSize);
        BYTE const windowLogByte = (BYTE)((params.cParams.windowLog - ZSTD_WINDOWLOG_ABSOLUTEMIN) << 3);
-       U32 const fcsCode = params.fParams.contentSizeFlag ? (pledgedSrcSize >= 256) + (pledgedSrcSize >= 65536 + 256) + (pledgedSrcSize >= 0xFFFFFFFFU)
-                                                          : /* 0-3 */
-                               0;
+       U32 const fcsCode =
+           params.fParams.contentSizeFlag ? (pledgedSrcSize >= 256) + (pledgedSrcSize >= 65536 + 256) + (pledgedSrcSize >= 0xFFFFFFFFU) : 0; /* 0-3 */
        BYTE const frameHeaderDecriptionByte = (BYTE)(dictIDSizeCode + (checksumFlag << 2) + (singleSegment << 5) + (fcsCode << 6));
        size_t pos;
 

diff --git a/contrib/linux-kernel/lib/zstd/decompress.c b/contrib/linux-kernel/lib/zstd/decompress.c
index 2926b36fcf7e4c71f413b712fdec460e3de4d670..def10ea4de7c0c6af9db1e962d74b096b5927439 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/decompress.c
+++ b/contrib/linux-kernel/lib/zstd/decompress.c
@@ -2300,7 +2300,6 @@ size_t ZSTD_decompressStream(ZSTD_DStream *zds, ZSTD_outBuffer *output, ZSTD_inB
                                ip += toLoad;
                                break;
                        }
-               }
 
                        /* check for single-pass mode opportunity */
                        if (zds->fParams.frameContentSize && zds->fParams.windowSize /* skippable frame if == 0 */
@@ -2355,6 +2354,7 @@ size_t ZSTD_decompressStream(ZSTD_DStream *zds, ZSTD_outBuffer *output, ZSTD_inB
                                }
                        }
                        zds->stage = zdss_read;
+               }
                /* pass-through */
 
                case zdss_read: {

diff --git a/contrib/linux-kernel/lib/zstd/fse.h b/contrib/linux-kernel/lib/zstd/fse.h
index 9749755c35b8182872af4dee53b0b6eef4f6c886..bc2962aecbe5b0e98505b6a51e3b8d270ce1a03b 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/fse.h
+++ b/contrib/linux-kernel/lib/zstd/fse.h
@@ -536,8 +536,6 @@ ZSTD_STATIC BYTE FSE_decodeSymbolFast(FSE_DState_t *DStatePtr, BIT_DStream_t *bi
 
 ZSTD_STATIC unsigned FSE_endOfDState(const FSE_DState_t *DStatePtr) { return DStatePtr->state == 0; }
 
-#ifndef FSE_COMMONDEFS_ONLY
-
 /* **************************************************************
 *  Tuning parameters
 ****************************************************************/
@@ -567,8 +565,6 @@ ZSTD_STATIC unsigned FSE_endOfDState(const FSE_DState_t *DStatePtr) { return DSt
 #define FSE_FUNCTION_EXTENSION
 #define FSE_DECODE_TYPE FSE_decode_t
 
-#endif /* !FSE_COMMONDEFS_ONLY */
-
 /* ***************************************************************
 *  Constants
 *****************************************************************/

diff --git a/contrib/linux-kernel/lib/zstd/fse_compress.c b/contrib/linux-kernel/lib/zstd/fse_compress.c
index 6bb810ff8937dad44711ad728add91a23f26374f..e016bb1778337cea9edb4f3cd90e7ee34eb43d08 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/fse_compress.c
+++ b/contrib/linux-kernel/lib/zstd/fse_compress.c
@@ -180,8 +180,6 @@ size_t FSE_buildCTable_wksp(FSE_CTable *ct, const short *normalizedCounter, unsi
        return 0;
 }
 
-#ifndef FSE_COMMONDEFS_ONLY
-
 /*-**************************************************************
 *  FSE NCount encoding-decoding
 ****************************************************************/
@@ -857,5 +855,3 @@ size_t FSE_compress_wksp(void *dst, size_t dstSize, const void *src, size_t srcS
 
        return op - ostart;
 }
-
-#endif /* FSE_COMMONDEFS_ONLY */

diff --git a/contrib/linux-kernel/lib/zstd/fse_decompress.c b/contrib/linux-kernel/lib/zstd/fse_decompress.c
index 245570a8a78123c491852c2ea251b1528f06d48a..96cf89ff9f6a6fb22ded1cd5609c27313c97a031 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/fse_decompress.c
+++ b/contrib/linux-kernel/lib/zstd/fse_decompress.c
@@ -161,8 +161,6 @@ size_t FSE_buildDTable(FSE_DTable *dt, const short *normalizedCounter, unsigned
        return 0;
 }
 
-#ifndef FSE_COMMONDEFS_ONLY
-
 /*-*******************************************************
 *  Decompression (Byte symbols)
 *********************************************************/
@@ -313,5 +311,3 @@ size_t FSE_decompress_wksp(void *dst, size_t dstCapacity, const void *cSrc, size
 
        return FSE_decompress_usingDTable(dst, dstCapacity, ip, cSrcSize, workSpace); /* always return, even if it is an error code */
 }
-
-#endif /* FSE_COMMONDEFS_ONLY */

diff --git a/contrib/linux-kernel/lib/zstd/huf_compress.c b/contrib/linux-kernel/lib/zstd/huf_compress.c
index 158740129779a7a6a754d81d8e3c24c88fc595c9..e82a136a1baf54cf932e1e10a6022e7925f133a2 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/huf_compress.c
+++ b/contrib/linux-kernel/lib/zstd/huf_compress.c
@@ -305,9 +305,8 @@ static U32 HUF_setMaxHeight(nodeElt *huffNode, U32 lastNonNull, U32 maxNbBits)
                                        }
                                }
                                /* only triggered when no more rank 1 symbol left => find closest one (note : there is necessarily at least one !) */
-                               while (
-                                   (nBitsToDecrease <= HUF_TABLELOG_MAX) &&
-                                   (rankLast[nBitsToDecrease] == noSymbol)) /* HUF_MAX_TABLELOG test just to please gcc 5+; but it should not be necessary */
+                               /* HUF_MAX_TABLELOG test just to please gcc 5+; but it should not be necessary */
+                               while ((nBitsToDecrease <= HUF_TABLELOG_MAX) && (rankLast[nBitsToDecrease] == noSymbol))
                                        nBitsToDecrease++;
                                totalCost -= 1 << (nBitsToDecrease - 1);
                                if (rankLast[nBitsToDecrease - 1] == noSymbol)

diff --git a/contrib/linux-kernel/lib/zstd/huf_decompress.c b/contrib/linux-kernel/lib/zstd/huf_decompress.c
index 5c38aa30d6c33f88d23dfcddb0fc217a2f152bd1..950c19443fc8cc77645a3efec1ce81adbbebf47c 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/huf_decompress.c
+++ b/contrib/linux-kernel/lib/zstd/huf_decompress.c
@@ -573,9 +573,8 @@ static U32 HUF_decodeLastSymbolX4(void *op, BIT_DStream_t *DStream, const HUF_DE
                if (DStream->bitsConsumed < (sizeof(DStream->bitContainer) * 8)) {
                        BIT_skipBits(DStream, dt[val].nbBits);
                        if (DStream->bitsConsumed > (sizeof(DStream->bitContainer) * 8))
-                               DStream->bitsConsumed =
-                                   (sizeof(DStream->bitContainer) *
-                                    8); /* ugly hack; works only because it's the last symbol. Note : can't easily extract nbBits from just this symbol */
+                               /* ugly hack; works only because it's the last symbol. Note : can't easily extract nbBits from just this symbol */
+                               DStream->bitsConsumed = (sizeof(DStream->bitContainer) * 8);
                }
        }
        return 1;