From ddc68e174b4a4035a5d2cb3eacd2a82ccc2918bb Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Wed, 17 May 2017 15:06:41 -0700 Subject: [PATCH] [linux-kernel] Fix a weird clang-format corner case --- contrib/linux-kernel/lib/zstd/bitstream.h | 2 +- contrib/linux-kernel/lib/zstd/compress.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/linux-kernel/lib/zstd/bitstream.h b/contrib/linux-kernel/lib/zstd/bitstream.h index 0fa6db129..a826b99e1 100644 --- 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 6c07a04cc..39b8c3b8f 100644 --- 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);