[linux-kernel] Fix a weird clang-format corner case

diff --git a/contrib/linux-kernel/lib/zstd/bitstream.h b/contrib/linux-kernel/lib/zstd/bitstream.h
index 0fa6db129951b176463fb4551bf815dcc51662f7..a826b99e1d63526d576ffbb818645fe356238af1 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/bitstream.h
+++ b/contrib/linux-kernel/lib/zstd/bitstream.h
@@ -113,7 +113,7 @@ typedef enum {
        BIT_DStream_completed = 2,
        BIT_DStream_overflow = 3
 } BIT_DStream_status; /* result of BIT_reloadDStream() */
-                     /* 1,2,4,8 would be better for bitmap combinations, but slows down performance a bit ... :( */
+/* 1,2,4,8 would be better for bitmap combinations, but slows down performance a bit ... :( */
 
 ZSTD_STATIC size_t BIT_initDStream(BIT_DStream_t *bitD, const void *srcBuffer, size_t srcSize);
 ZSTD_STATIC size_t BIT_readBits(BIT_DStream_t *bitD, unsigned nbBits);

diff --git a/contrib/linux-kernel/lib/zstd/compress.c b/contrib/linux-kernel/lib/zstd/compress.c
index 6c07a04ccc7ea21656138197bdca92b5e76ae608..39b8c3b8f9c963060932a09c7300f1d0db7f6297 100644 (file)
--- a/contrib/linux-kernel/lib/zstd/compress.c
+++ b/contrib/linux-kernel/lib/zstd/compress.c
@@ -1796,10 +1796,11 @@ U32 ZSTD_insertAndFindFirstIndex(ZSTD_CCtx *zc, const BYTE *ip, U32 mls)
        return hashTable[ZSTD_hashPtr(ip, hashLog, mls)];
 }
 
-FORCE_INLINE /* inlining is important to hardwire a hot branch (template emulation) */
-    size_t
-    ZSTD_HcFindBestMatch_generic(ZSTD_CCtx *zc, /* Index table will be updated */
-                                const BYTE *const ip, const BYTE *const iLimit, size_t *offsetPtr, const U32 maxNbAttempts, const U32 mls, const U32 extDict)
+/* inlining is important to hardwire a hot branch (template emulation) */
+FORCE_INLINE
+size_t ZSTD_HcFindBestMatch_generic(ZSTD_CCtx *zc, /* Index table will be updated */
+                                   const BYTE *const ip, const BYTE *const iLimit, size_t *offsetPtr, const U32 maxNbAttempts, const U32 mls,
+                                   const U32 extDict)
 {
        U32 *const chainTable = zc->chainTable;
        const U32 chainSize = (1 << zc->params.cParams.chainLog);