AuroraMiddleware/zstd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[linux-kernel] Fix clang-format edge case with goto labels

Browse Source
This commit is contained in:
Nick Terrell 2017-05-25 13:56:46 -07:00
parent 5d62c16ff5
commit e63fff9b97
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/linux-kernel/lib/zstd/compress.c
View File

@ -816,14 +816,15 @@ ZSTD_STATIC size_t ZSTD_compressSequences(ZSTD_CCtx *zc, void *dst, size_t dstCa
} }
/* check compressibility */ /* check compressibility */
_check_compressibility : { _check_compressibility:
size_t const minGain = ZSTD_minGain(srcSize); {
size_t const maxCSize = srcSize - minGain; size_t const minGain = ZSTD_minGain(srcSize);
if ((size_t)(op - ostart) >= maxCSize) { size_t const maxCSize = srcSize - minGain;
zc->flagStaticHufTable = HUF_repeat_none; if ((size_t)(op - ostart) >= maxCSize) {
return 0; zc->flagStaticHufTable = HUF_repeat_none;
return 0;
}
} }
}
/* confirm repcodes */ /* confirm repcodes */
{ {
@ -1990,11 +1991,12 @@ void ZSTD_compressBlock_lazy_generic(ZSTD_CCtx *ctx, const void *src, size_t src
} }
/* store sequence */ /* store sequence */
_storeSequence : { _storeSequence:
size_t const litLength = start - anchor; {
ZSTD_storeSeq(seqStorePtr, litLength, anchor, (U32)offset, matchLength - MINMATCH); size_t const litLength = start - anchor;
anchor = ip = start + matchLength; ZSTD_storeSeq(seqStorePtr, litLength, anchor, (U32)offset, matchLength - MINMATCH);
} anchor = ip = start + matchLength;
}
/* check immediate repcode */ /* check immediate repcode */
while ((ip <= ilimit) && ((offset_2 > 0) & (ZSTD_read32(ip) == ZSTD_read32(ip - offset_2)))) { while ((ip <= ilimit) && ((offset_2 > 0) & (ZSTD_read32(ip) == ZSTD_read32(ip - offset_2)))) {

4
contrib/linux-kernel/lib/zstd/zstd_opt.h
View File

@ -628,7 +628,7 @@ void ZSTD_compressBlock_opt_generic(ZSTD_CCtx *ctx, const void *src, size_t srcS
cur = last_pos - best_mlen; cur = last_pos - best_mlen;
/* store sequence */ /* store sequence */
_storeSequence: /* cur, last_pos, best_mlen, best_off have to be set */ _storeSequence: /* cur, last_pos, best_mlen, best_off have to be set */
opt[0].mlen = 1; opt[0].mlen = 1;
while (1) { while (1) {
@ -942,7 +942,7 @@ void ZSTD_compressBlock_opt_extDict_generic(ZSTD_CCtx *ctx, const void *src, siz
cur = last_pos - best_mlen; cur = last_pos - best_mlen;
/* store sequence */ /* store sequence */
_storeSequence: /* cur, last_pos, best_mlen, best_off have to be set */ _storeSequence: /* cur, last_pos, best_mlen, best_off have to be set */
opt[0].mlen = 1; opt[0].mlen = 1;
while (1) { while (1) {