summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-04-01 14:53:08 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-04-01 14:53:08 (GMT)
commit28e237e954098c418f048a871aa53199d92314f4 (patch)
tree990e4712dc0b63ac1e9ae10d8b8b55235de533a4 /lib
parent89eee0d28b2b7c5954e1cb0dce60542e4c597130 (diff)
downloadlz4-28e237e954098c418f048a871aa53199d92314f4.zip
lz4-28e237e954098c418f048a871aa53199d92314f4.tar.gz
lz4-28e237e954098c418f048a871aa53199d92314f4.tar.bz2
simplified LZ4_compress_limitedOutput()
Diffstat (limited to 'lib')
-rw-r--r--lib/lz4.c19
-rw-r--r--lib/lz4.h2
2 files changed, 4 insertions, 17 deletions
diff --git a/lib/lz4.c b/lib/lz4.c
index 31dfc9f..b0ce64f 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -771,26 +771,13 @@ int LZ4_compress_withState (void* state, const char* source, char* dest, int inp
int LZ4_compress_limitedOutput(const char* source, char* dest, int inputSize, int maxOutputSize)
{
#if (HEAPMODE)
- void* ctx = ALLOCATOR(LZ4_STREAMSIZE_U64, 8); /* Aligned on 8-bytes boundaries */
+ void* ctx = ALLOCATOR(LZ4_STREAMSIZE_U64, 8); /* malloc-calloc aligned on 8-bytes boundaries */
#else
U64 ctx[LZ4_STREAMSIZE_U64] = {0}; /* Ensure data is aligned on 8-bytes boundaries */
#endif
- int result;
- if (maxOutputSize >= LZ4_compressBound(inputSize))
- {
- if (inputSize < LZ4_64Klimit)
- result = LZ4_compress_generic((void*)ctx, source, dest, inputSize, 0, notLimited, byU16, noDict, noDictIssue, 1);
- else
- result = LZ4_compress_generic((void*)ctx, source, dest, inputSize, 0, notLimited, LZ4_64bits() ? byU32 : byPtr, noDict, noDictIssue, 1);
- }
- else
- {
- if (inputSize < LZ4_64Klimit)
- result = LZ4_compress_generic((void*)ctx, source, dest, inputSize, maxOutputSize, limitedOutput, byU16, noDict, noDictIssue, 1);
- else
- result = LZ4_compress_generic((void*)ctx, source, dest, inputSize, maxOutputSize, limitedOutput, LZ4_64bits() ? byU32 : byPtr, noDict, noDictIssue, 1);
- }
+ int result = LZ4_compress_limitedOutput_withState(ctx, source, dest, inputSize, maxOutputSize);
+
#if (HEAPMODE)
FREEMEM(ctx);
#endif
diff --git a/lib/lz4.h b/lib/lz4.h
index 7072c37..92c8738 100644
--- a/lib/lz4.h
+++ b/lib/lz4.h
@@ -48,7 +48,7 @@ extern "C" {
* Version
**************************************/
#define LZ4_VERSION_MAJOR 1 /* for breaking interface changes */
-#define LZ4_VERSION_MINOR 6 /* for new (non-breaking) interface capabilities */
+#define LZ4_VERSION_MINOR 7 /* for new (non-breaking) interface capabilities */
#define LZ4_VERSION_RELEASE 0 /* for tweaks, bug-fixes, or development */
#define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE)
int LZ4_versionNumber (void);