From 95dfd4814363e44db29e539f73d10dcdff0a31ee Mon Sep 17 00:00:00 2001 From: shakeelrao Date: Fri, 1 Mar 2019 23:11:15 -0800 Subject: [PATCH] update formatting --- lib/decompress/zstd_decompress.c | 6 ++---- tests/fuzzer.c | 15 +++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c index 254e2923..268ba386 100644 --- a/lib/decompress/zstd_decompress.c +++ b/lib/decompress/zstd_decompress.c @@ -474,8 +474,7 @@ static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize ZSTD_frameHeader zfh; /* Extract Frame Header */ - { - size_t const ret = ZSTD_getFrameHeader(&zfh, src, srcSize); + { size_t const ret = ZSTD_getFrameHeader(&zfh, src, srcSize); if (ZSTD_isError(ret)) return ZSTD_errorFrameSizeInfo(ret); if (ret > 0) @@ -543,9 +542,8 @@ unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize) ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize); size_t const compressedSize = frameSizeInfo.compressedSize; unsigned long long const decompressedBound = frameSizeInfo.decompressedBound; - if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR) { + if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR) return ZSTD_CONTENTSIZE_ERROR; - } src = (const BYTE*)src + compressedSize; srcSize -= compressedSize; bound += decompressedBound; diff --git a/tests/fuzzer.c b/tests/fuzzer.c index a61df218..37531379 100644 --- a/tests/fuzzer.c +++ b/tests/fuzzer.c @@ -378,8 +378,8 @@ static int basicUnitTests(U32 seed, double compressibility) DISPLAYLEVEL(3, "test%3i : tight ZSTD_decompressBound test : ", testNb++); { - unsigned long long rSize = ZSTD_decompressBound(compressedBuffer, cSize); - if (rSize != CNBuffSize) goto _output_error; + unsigned long long bound = ZSTD_decompressBound(compressedBuffer, cSize); + if (bound != CNBuffSize) goto _output_error; } DISPLAYLEVEL(3, "OK \n"); @@ -450,12 +450,11 @@ static int basicUnitTests(U32 seed, double compressibility) } { /* ensure frame content size is missing */ ZSTD_frameHeader zfh; - size_t ret = ZSTD_getFrameHeader(&zfh, compressedBuffer, compressedBufferSize); - if (ret != 0) goto _output_error; - if (zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) goto _output_error; + size_t const ret = ZSTD_getFrameHeader(&zfh, compressedBuffer, compressedBufferSize); + if (ret != 0 || zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) goto _output_error; } { /* ensure CNBuffSize <= decompressBound */ - unsigned long long bound = ZSTD_decompressBound(compressedBuffer, compressedBufferSize); + unsigned long long const bound = ZSTD_decompressBound(compressedBuffer, compressedBufferSize); if (CNBuffSize > bound) goto _output_error; } DISPLAYLEVEL(3, "OK \n"); @@ -931,8 +930,8 @@ static int basicUnitTests(U32 seed, double compressibility) DISPLAYLEVEL(3, "OK \n"); DISPLAYLEVEL(3, "test%3i : get tight decompressed bound of multiple frames : ", testNb++); - { unsigned long long const r = ZSTD_decompressBound(compressedBuffer, cSize); - if (r != CNBuffSize / 2) goto _output_error; } + { unsigned long long const bound = ZSTD_decompressBound(compressedBuffer, cSize); + if (bound != CNBuffSize / 2) goto _output_error; } DISPLAYLEVEL(3, "OK \n"); DISPLAYLEVEL(3, "test%3i : decompress multiple frames : ", testNb++);