diff --git a/Makefile b/Makefile index 25cedbcd..700d7729 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ INCLUDEDIR=$(PREFIX)/include LZ4DIR = lib PRGDIR = programs TESTDIR = tests +EXDIR = examples # Define nul output @@ -57,6 +58,7 @@ all: @$(MAKE) -C $(LZ4DIR) $@ @$(MAKE) -C $(PRGDIR) $@ @$(MAKE) -C $(TESTDIR) $@ + @$(MAKE) -C $(EXDIR) $@ lib: @$(MAKE) -C $(LZ4DIR) @@ -73,6 +75,7 @@ clean: @$(MAKE) -C $(PRGDIR) $@ > $(VOID) @$(MAKE) -C $(TESTDIR) $@ > $(VOID) @$(MAKE) -C $(LZ4DIR) $@ > $(VOID) + @$(MAKE) -C $(EXDIR) $@ > $(VOID) @$(MAKE) -C examples $@ > $(VOID) @$(RM) lz4$(EXT) @echo Cleaning completed diff --git a/examples/HCStreaming_ringBuffer.c b/examples/HCStreaming_ringBuffer.c index cfae9d74..a9c00f42 100644 --- a/examples/HCStreaming_ringBuffer.c +++ b/examples/HCStreaming_ringBuffer.c @@ -68,8 +68,9 @@ void test_compress(FILE* outFp, FILE* inpFp) if (0 == inpBytes) break; { - char cmpBuf[LZ4_COMPRESSBOUND(MESSAGE_MAX_BYTES)]; - const int cmpBytes = LZ4_compressHC_continue(lz4Stream, inpPtr, cmpBuf, inpBytes); +#define CMPBUFSIZE (LZ4_COMPRESSBOUND(MESSAGE_MAX_BYTES)) + char cmpBuf[CMPBUFSIZE]; + const int cmpBytes = LZ4_compress_HC_continue(lz4Stream, inpPtr, cmpBuf, inpBytes, CMPBUFSIZE); if(cmpBytes <= 0) break; write_int32(outFp, cmpBytes); @@ -97,7 +98,7 @@ void test_decompress(FILE* outFp, FILE* inpFp) for(;;) { int cmpBytes = 0; - char cmpBuf[LZ4_COMPRESSBOUND(MESSAGE_MAX_BYTES)]; + char cmpBuf[CMPBUFSIZE]; { const size_t r0 = read_int32(inpFp, &cmpBytes); diff --git a/examples/blockStreaming_ringBuffer.c b/examples/blockStreaming_ringBuffer.c index beb5e661..697d342c 100644 --- a/examples/blockStreaming_ringBuffer.c +++ b/examples/blockStreaming_ringBuffer.c @@ -64,8 +64,9 @@ void test_compress(FILE* outFp, FILE* inpFp) if (0 == inpBytes) break; { - char cmpBuf[LZ4_COMPRESSBOUND(MESSAGE_MAX_BYTES)]; - const int cmpBytes = LZ4_compress_continue(lz4Stream, inpPtr, cmpBuf, inpBytes); +#define CMPBUFSIZE (LZ4_COMPRESSBOUND(MESSAGE_MAX_BYTES)) + char cmpBuf[CMPBUFSIZE]; + const int cmpBytes = LZ4_compress_fast_continue(lz4Stream, inpPtr, cmpBuf, inpBytes, CMPBUFSIZE, 0); if(cmpBytes <= 0) break; write_int32(outFp, cmpBytes); write_bin(outFp, cmpBuf, cmpBytes); @@ -90,7 +91,7 @@ void test_decompress(FILE* outFp, FILE* inpFp) for(;;) { int cmpBytes = 0; - char cmpBuf[LZ4_COMPRESSBOUND(MESSAGE_MAX_BYTES)]; + char cmpBuf[CMPBUFSIZE]; { const size_t r0 = read_int32(inpFp, &cmpBytes);