summaryrefslogtreecommitdiffstats
path: root/lib/lz4frame.c
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-04-20 11:12:02 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-04-20 11:12:02 (GMT)
commita01e10dbdc58ae3bcef3348c6b196fc733b942b7 (patch)
tree626f9090abc89861c3a1db212410a5aa4e91b0a4 /lib/lz4frame.c
parentcbcdd88ccb97632015cf3732b46f8800e62e337b (diff)
downloadlz4-a01e10dbdc58ae3bcef3348c6b196fc733b942b7.zip
lz4-a01e10dbdc58ae3bcef3348c6b196fc733b942b7.tar.gz
lz4-a01e10dbdc58ae3bcef3348c6b196fc733b942b7.tar.bz2
Changed LZ4F compressionLevel from unsigned to signed, in anticipation for LZ4_compress_fast() integration.
Diffstat (limited to 'lib/lz4frame.c')
-rw-r--r--lib/lz4frame.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/lz4frame.c b/lib/lz4frame.c
index 7fc1314..eb38390 100644
--- a/lib/lz4frame.c
+++ b/lib/lz4frame.c
@@ -105,7 +105,7 @@ typedef unsigned long long U64;
static const size_t minFHSize = 7;
static const size_t maxFHSize = 15;
static const size_t BHSize = 4;
-static const U32 minHClevel = 3;
+static const int minHClevel = 3;
/**************************************
* Structures and local types
@@ -306,7 +306,7 @@ size_t LZ4F_compressFrame(void* dstBuffer, size_t dstMaxSize, const void* srcBuf
if (prefs.frameInfo.contentSize != 0)
prefs.frameInfo.contentSize = (U64)srcSize; /* auto-correct content size if selected (!=0) */
- if (prefs.compressionLevel < minHClevel)
+ if (prefs.compressionLevel < (int)minHClevel)
{
cctxI.lz4CtxPtr = &lz4ctx;
cctxI.lz4CtxLevel = 1;
@@ -334,7 +334,7 @@ size_t LZ4F_compressFrame(void* dstBuffer, size_t dstMaxSize, const void* srcBuf
if (LZ4F_isError(errorCode)) return errorCode;
dstPtr += errorCode;
- if (prefs.compressionLevel >= minHClevel) /* no allocation necessary with lz4 fast */
+ if (prefs.compressionLevel >= (int)minHClevel) /* no allocation necessary with lz4 fast */
FREEMEM(cctxI.lz4CtxPtr);
return (dstPtr - dstStart);
@@ -407,11 +407,11 @@ size_t LZ4F_compressBegin(LZ4F_compressionContext_t compressionContext, void* ds
/* ctx Management */
{
- U32 tableID = cctxPtr->prefs.compressionLevel<minHClevel ? 1 : 2; /* 0:nothing ; 1:LZ4 table ; 2:HC tables */
+ U32 tableID = (cctxPtr->prefs.compressionLevel < minHClevel) ? 1 : 2; /* 0:nothing ; 1:LZ4 table ; 2:HC tables */
if (cctxPtr->lz4CtxLevel < tableID)
{
FREEMEM(cctxPtr->lz4CtxPtr);
- if (cctxPtr->prefs.compressionLevel<minHClevel)
+ if (cctxPtr->prefs.compressionLevel < minHClevel)
cctxPtr->lz4CtxPtr = (void*)LZ4_createStream();
else
cctxPtr->lz4CtxPtr = (void*)LZ4_createStreamHC();
@@ -531,7 +531,7 @@ static int LZ4F_localLZ4_compressHC_limitedOutput_continue(void* ctx, const char
return LZ4_compressHC_limitedOutput_continue((LZ4_streamHC_t*)ctx, src, dst, srcSize, dstSize);
}
-static compressFunc_t LZ4F_selectCompression(LZ4F_blockMode_t blockMode, U32 level)
+static compressFunc_t LZ4F_selectCompression(LZ4F_blockMode_t blockMode, int level)
{
if (level < minHClevel)
{