summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-03-29 10:20:09 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-03-29 10:20:09 (GMT)
commitd5da787c1bd92a22c87b6428321668548155995f (patch)
treee8a7882bf7a1c7ebf13270faa8ebd9e5970916b3 /lib
parentce71b073b5a4a9e2bdd78855f50ddc146baac1c5 (diff)
downloadlz4-d5da787c1bd92a22c87b6428321668548155995f.zip
lz4-d5da787c1bd92a22c87b6428321668548155995f.tar.gz
lz4-d5da787c1bd92a22c87b6428321668548155995f.tar.bz2
Changed struct member to contentSize
Diffstat (limited to 'lib')
-rw-r--r--lib/lz4frame.c20
-rw-r--r--lib/lz4frame.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/lz4frame.c b/lib/lz4frame.c
index 644f3e8..521be86 100644
--- a/lib/lz4frame.c
+++ b/lib/lz4frame.c
@@ -299,10 +299,10 @@ size_t LZ4F_compressFrame(void* dstBuffer, size_t dstMaxSize, const void* srcBuf
else
{
memset(&prefs, 0, sizeof(prefs));
- prefs.frameInfo.frameOSize = (U64)srcSize;
+ prefs.frameInfo.contentSize = (U64)srcSize;
}
- if (prefs.frameInfo.frameOSize != 0)
- prefs.frameInfo.frameOSize = (U64)srcSize; /* correct frame size if selected (!=0) */
+ if (prefs.frameInfo.contentSize != 0)
+ prefs.frameInfo.contentSize = (U64)srcSize; /* correct content size if selected (!=0) */
if (prefs.compressionLevel < minHClevel)
{
@@ -446,13 +446,13 @@ size_t LZ4F_compressBegin(LZ4F_compressionContext_t compressionContext, void* ds
*dstPtr++ = ((1 & _2BITS) << 6) /* Version('01') */
+ ((cctxPtr->prefs.frameInfo.blockMode & _1BIT ) << 5) /* Block mode */
+ (BYTE)((cctxPtr->prefs.frameInfo.contentChecksumFlag & _1BIT ) << 2) /* Frame checksum */
- + (BYTE)((cctxPtr->prefs.frameInfo.frameOSize > 0) << 3); /* Frame content size */
+ + (BYTE)((cctxPtr->prefs.frameInfo.contentSize > 0) << 3); /* Frame content size */
/* BD Byte */
*dstPtr++ = (BYTE)((cctxPtr->prefs.frameInfo.blockSizeID & _3BITS) << 4);
/* Optional Frame content size field */
- if (cctxPtr->prefs.frameInfo.frameOSize)
+ if (cctxPtr->prefs.frameInfo.contentSize)
{
- LZ4F_writeLE64(dstPtr, cctxPtr->prefs.frameInfo.frameOSize);
+ LZ4F_writeLE64(dstPtr, cctxPtr->prefs.frameInfo.contentSize);
dstPtr += 8;
cctxPtr->totalInSize = 0;
}
@@ -729,9 +729,9 @@ size_t LZ4F_compressEnd(LZ4F_compressionContext_t compressionContext, void* dstB
cctxPtr->cStage = 0; /* state is now re-usable (with identical preferences) */
- if (cctxPtr->prefs.frameInfo.frameOSize)
+ if (cctxPtr->prefs.frameInfo.contentSize)
{
- if (cctxPtr->prefs.frameInfo.frameOSize != cctxPtr->totalInSize)
+ if (cctxPtr->prefs.frameInfo.contentSize != cctxPtr->totalInSize)
return (size_t)-ERROR_frameSize_wrong;
}
@@ -871,7 +871,7 @@ static size_t LZ4F_decodeHeader(LZ4F_dctx_internal_t* dctxPtr, const void* srcVo
dctxPtr->frameInfo.blockSizeID = (blockSizeID_t)blockSizeID;
dctxPtr->maxBlockSize = LZ4F_getBlockSize(blockSizeID);
if (contentSizeFlag)
- dctxPtr->frameInfo.frameOSize = LZ4F_readLE64(srcPtr+6);
+ dctxPtr->frameInfo.contentSize = LZ4F_readLE64(srcPtr+6);
/* init */
if (contentChecksumFlag) XXH32_reset(&(dctxPtr->xxh), 0);
@@ -1389,7 +1389,7 @@ size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext,
/* case dstage_decodeSBlockSize: */ /* no direct access */
{
size_t SFrameSize = LZ4F_readLE32(selectedIn);
- dctxPtr->frameInfo.frameOSize = SFrameSize;
+ dctxPtr->frameInfo.contentSize = SFrameSize;
dctxPtr->tmpInTarget = SFrameSize;
dctxPtr->dStage = dstage_skipSkippable;
break;
diff --git a/lib/lz4frame.h b/lib/lz4frame.h
index 54db165..e29f84a 100644
--- a/lib/lz4frame.h
+++ b/lib/lz4frame.h
@@ -72,7 +72,7 @@ typedef struct {
blockMode_t blockMode; /* blockLinked, blockIndependent ; 0 == default */
contentChecksum_t contentChecksumFlag; /* noContentChecksum, contentChecksumEnabled ; 0 == default */
frameType_t frameType; /* LZ4F_frame, skippableFrame ; 0 == default */
- unsigned long long frameOSize; /* Size of uncompressed (original) content ; 0 == unknown */
+ unsigned long long contentSize; /* Size of uncompressed (original) content ; 0 == unknown */
unsigned reserved[2]; /* must be zero for forward compatibility */
} LZ4F_frameInfo_t;