krak/zstd
krak/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-03-06 16:56:49 +02:00
Code Issues Releases 1 Activity

update formatting

Browse Source
This commit is contained in:
shakeelrao 2019-03-01 23:11:15 -08:00
parent 3da3dc2f45
commit 95dfd48143
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/decompress/zstd_decompress.c
View File

@ -474,8 +474,7 @@ static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize
ZSTD_frameHeader zfh; ZSTD_frameHeader zfh;
/* Extract Frame Header */ /* 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)) if (ZSTD_isError(ret))
return ZSTD_errorFrameSizeInfo(ret); return ZSTD_errorFrameSizeInfo(ret);
if (ret > 0) 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); ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize);
size_t const compressedSize = frameSizeInfo.compressedSize; size_t const compressedSize = frameSizeInfo.compressedSize;
unsigned long long const decompressedBound = frameSizeInfo.decompressedBound; 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; return ZSTD_CONTENTSIZE_ERROR;
}
src = (const BYTE*)src + compressedSize; src = (const BYTE*)src + compressedSize;
srcSize -= compressedSize; srcSize -= compressedSize;
bound += decompressedBound; bound += decompressedBound;

15
tests/fuzzer.c
View File

@ -378,8 +378,8 @@ static int basicUnitTests(U32 seed, double compressibility)
DISPLAYLEVEL(3, "test%3i : tight ZSTD_decompressBound test : ", testNb++); DISPLAYLEVEL(3, "test%3i : tight ZSTD_decompressBound test : ", testNb++);
{ {
unsigned long long rSize = ZSTD_decompressBound(compressedBuffer, cSize); unsigned long long bound = ZSTD_decompressBound(compressedBuffer, cSize);
if (rSize != CNBuffSize) goto _output_error; if (bound != CNBuffSize) goto _output_error;
} }
DISPLAYLEVEL(3, "OK \n"); DISPLAYLEVEL(3, "OK \n");
@ -450,12 +450,11 @@ static int basicUnitTests(U32 seed, double compressibility)
} }
{ /* ensure frame content size is missing */ { /* ensure frame content size is missing */
ZSTD_frameHeader zfh; ZSTD_frameHeader zfh;
size_t ret = ZSTD_getFrameHeader(&zfh, compressedBuffer, compressedBufferSize); size_t const ret = ZSTD_getFrameHeader(&zfh, compressedBuffer, compressedBufferSize);
if (ret != 0) goto _output_error; if (ret != 0 || zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) goto _output_error;
if (zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) goto _output_error;
} }
{ /* ensure CNBuffSize <= decompressBound */ { /* 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; if (CNBuffSize > bound) goto _output_error;
} }
DISPLAYLEVEL(3, "OK \n"); DISPLAYLEVEL(3, "OK \n");
@ -931,8 +930,8 @@ static int basicUnitTests(U32 seed, double compressibility)
DISPLAYLEVEL(3, "OK \n"); DISPLAYLEVEL(3, "OK \n");
DISPLAYLEVEL(3, "test%3i : get tight decompressed bound of multiple frames : ", testNb++); DISPLAYLEVEL(3, "test%3i : get tight decompressed bound of multiple frames : ", testNb++);
{ unsigned long long const r = ZSTD_decompressBound(compressedBuffer, cSize); { unsigned long long const bound = ZSTD_decompressBound(compressedBuffer, cSize);
if (r != CNBuffSize / 2) goto _output_error; } if (bound != CNBuffSize / 2) goto _output_error; }
DISPLAYLEVEL(3, "OK \n"); DISPLAYLEVEL(3, "OK \n");
DISPLAYLEVEL(3, "test%3i : decompress multiple frames : ", testNb++); DISPLAYLEVEL(3, "test%3i : decompress multiple frames : ", testNb++);