diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/lz4.c | 2 | ||||
| -rw-r--r-- | lib/lz4file.c | 4 | ||||
| -rw-r--r-- | lib/lz4file.h | 2 | ||||
| -rw-r--r-- | lib/lz4frame.c | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile index ee262c0..a7dbea2 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -189,6 +189,7 @@ install: lib liblz4.pc ifeq ($(BUILD_STATIC),yes) $(INSTALL_DATA) liblz4.a $(DESTDIR)$(libdir)/liblz4.a $(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h + $(INSTALL_DATA) lz4file.h $(DESTDIR)$(includedir)/lz4file.h endif ifeq ($(BUILD_SHARED),yes) # Traditionally, one installs the DLLs in the bin directory as programs @@ -224,6 +225,7 @@ uninstall: $(RM) $(DESTDIR)$(includedir)/lz4hc.h $(RM) $(DESTDIR)$(includedir)/lz4frame.h $(RM) $(DESTDIR)$(includedir)/lz4frame_static.h + $(RM) $(DESTDIR)$(includedir)/lz4file.h @echo lz4 libraries successfully uninstalled endif @@ -1786,7 +1786,7 @@ typedef enum { decode_full_block = 0, partial_decode = 1 } earlyEnd_directive; * does not know end of input * presumes input is well formed * note : will consume at least one byte */ -size_t read_long_length_no_check(const BYTE** pp) +static size_t read_long_length_no_check(const BYTE** pp) { size_t b, l = 0; do { b = **pp; (*pp)++; l += b; } while (b==255); diff --git a/lib/lz4file.c b/lib/lz4file.c index eaf9b17..982afe4 100644 --- a/lib/lz4file.c +++ b/lib/lz4file.c @@ -247,9 +247,9 @@ LZ4F_errorCode_t LZ4F_writeOpen(LZ4_writeFile_t** lz4fWrite, FILE* fp, const LZ4 return LZ4F_OK_NoError; } -size_t LZ4F_write(LZ4_writeFile_t* lz4fWrite, void* buf, size_t size) +size_t LZ4F_write(LZ4_writeFile_t* lz4fWrite, const void* buf, size_t size) { - LZ4_byte* p = (LZ4_byte*)buf; + const LZ4_byte* p = (const LZ4_byte*)buf; size_t remain = size; size_t chunk; size_t ret; diff --git a/lib/lz4file.h b/lib/lz4file.h index 5527130..723552c 100644 --- a/lib/lz4file.h +++ b/lib/lz4file.h @@ -78,7 +78,7 @@ LZ4FLIB_STATIC_API LZ4F_errorCode_t LZ4F_writeOpen(LZ4_writeFile_t** lz4fWrite, * `buf` write data buffer. * `size` write data buffer size. */ -LZ4FLIB_STATIC_API size_t LZ4F_write(LZ4_writeFile_t* lz4fWrite, void* buf, size_t size); +LZ4FLIB_STATIC_API size_t LZ4F_write(LZ4_writeFile_t* lz4fWrite, const void* buf, size_t size); /*! LZ4F_writeClose() : * Close lz4file handle. diff --git a/lib/lz4frame.c b/lib/lz4frame.c index d1cc5f0..fde0c37 100644 --- a/lib/lz4frame.c +++ b/lib/lz4frame.c @@ -1085,7 +1085,6 @@ size_t LZ4F_uncompressedUpdate(LZ4F_cctx* cctxPtr, void* dstBuffer, size_t dstCapacity, const void* srcBuffer, size_t srcSize, const LZ4F_compressOptions_t* compressOptionsPtr) { - RETURN_ERROR_IF(cctxPtr->prefs.frameInfo.blockMode != LZ4F_blockIndependent, blockMode_invalid); return LZ4F_compressUpdateImpl(cctxPtr, dstBuffer, dstCapacity, srcBuffer, srcSize, |