diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2015-03-16 18:19:39 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2015-03-16 18:19:39 (GMT) |
| commit | 2a02455fdfb7250ef629a3ffde5258e95df06e7b (patch) | |
| tree | cb11624d5b44c48293c7bb2ee0b5835ed55375df /lib | |
| parent | 3a6832497ba02607dd4ede3a3fd30911e06f037e (diff) | |
| download | lz4-2a02455fdfb7250ef629a3ffde5258e95df06e7b.zip lz4-2a02455fdfb7250ef629a3ffde5258e95df06e7b.tar.gz lz4-2a02455fdfb7250ef629a3ffde5258e95df06e7b.tar.bz2 | |
minor refactoring
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lz4frame.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/lz4frame.c b/lib/lz4frame.c index 99953c1..d08cf94 100644 --- a/lib/lz4frame.c +++ b/lib/lz4frame.c @@ -707,7 +707,7 @@ size_t LZ4F_compressEnd(LZ4F_compressionContext_t compressionContext, void* dstB * If the result LZ4F_errorCode_t is not zero, there was an error during context creation. * Object can release its memory using LZ4F_freeDecompressionContext(); */ -LZ4F_errorCode_t LZ4F_createDecompressionContext(LZ4F_compressionContext_t* LZ4F_decompressionContextPtr, unsigned versionNumber) +LZ4F_errorCode_t LZ4F_createDecompressionContext(LZ4F_decompressionContext_t* LZ4F_decompressionContextPtr, unsigned versionNumber) { LZ4F_dctx_internal_t* dctxPtr; @@ -719,7 +719,7 @@ LZ4F_errorCode_t LZ4F_createDecompressionContext(LZ4F_compressionContext_t* LZ4F return OK_NoError; } -LZ4F_errorCode_t LZ4F_freeDecompressionContext(LZ4F_compressionContext_t LZ4F_decompressionContext) +LZ4F_errorCode_t LZ4F_freeDecompressionContext(LZ4F_decompressionContext_t LZ4F_decompressionContext) { LZ4F_dctx_internal_t* dctxPtr = (LZ4F_dctx_internal_t*)LZ4F_decompressionContext; FREEMEM(dctxPtr->tmpIn); @@ -766,8 +766,18 @@ static size_t LZ4F_decodeHeader(LZ4F_dctx_internal_t* dctxPtr, const void* srcVo { memset(&(dctxPtr->frameInfo), 0, sizeof(dctxPtr->frameInfo)); dctxPtr->frameInfo.frameType = skippableFrame; - dctxPtr->dStage = dstage_getSBlockSize; - return 4; + if (srcVoidPtr == (void*)(dctxPtr->header)) + { + memcpy(dctxPtr->header, dctxPtr->header + 4, srcSize-4); + dctxPtr->tmpInSize = srcSize-4; + dctxPtr->dStage = dstage_storeSBlockSize; + return srcSize; + } + else + { + dctxPtr->dStage = dstage_getSBlockSize; + return 4; + } } /* control magic number */ @@ -1023,12 +1033,6 @@ size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext, } LZ4F_errorCode_t errorCode = LZ4F_decodeHeader(dctxPtr, dctxPtr->header, 7); if (LZ4F_isError(errorCode)) return errorCode; - if (errorCode==4) - { - memcpy(dctxPtr->header, dctxPtr->header + 4, 3); - dctxPtr->tmpInSize = 3; - dctxPtr->dStage = dstage_storeSBlockSize; - } break; } |