diff --git a/contrib/adaptive-compression/Makefile b/contrib/adaptive-compression/Makefile index fbab219c3..c6862198b 100644 --- a/contrib/adaptive-compression/Makefile +++ b/contrib/adaptive-compression/Makefile @@ -18,15 +18,15 @@ CFLAGS += $(DEBUGFLAGS) CFLAGS += $(MOREFLAGS) FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -all: clean v1 v2 -v1: $(ZSTD_FILES) v1.c +all: clean single multi +single: $(ZSTD_FILES) single.c $(CC) $(FLAGS) $^ -o $@ -v2: $(ZSTD_FILES) v2.c +multi: $(ZSTD_FILES) multi.c $(CC) $(FLAGS) $^ -o $@ clean: - @$(RM) -f v1 v2 + @$(RM) -f single multi @$(RM) -rf *.dSYM @$(RM) -f tmp* @echo "finished cleaning" diff --git a/contrib/adaptive-compression/v2.c b/contrib/adaptive-compression/multi.c similarity index 99% rename from contrib/adaptive-compression/v2.c rename to contrib/adaptive-compression/multi.c index c25f1db82..e1fa31774 100644 --- a/contrib/adaptive-compression/v2.c +++ b/contrib/adaptive-compression/multi.c @@ -174,7 +174,7 @@ static void* outputThread(void* arg) size_t const compressedSize = job->compressedSize; if (ZSTD_isError(compressedSize)) { DISPLAY("Error: an error occurred during compression\n"); - return arg; + return arg; } { size_t const writeSize = fwrite(ctx->jobs[currJob].dst.start, 1, compressedSize, ctx->dstFile); @@ -253,7 +253,7 @@ static int createCompressionJob(adaptCCtx* ctx, BYTE* data, size_t srcSize) /* return 0 if successful, else return error */ int main(int argCount, const char* argv[]) { - if (argCount < 2) { + if (argCount < 3) { DISPLAY("Error: not enough arguments\n"); return 1; } diff --git a/contrib/adaptive-compression/run.sh b/contrib/adaptive-compression/run.sh index f9e276730..b9c4caf7f 100755 --- a/contrib/adaptive-compression/run.sh +++ b/contrib/adaptive-compression/run.sh @@ -1,2 +1,6 @@ -make clean v2 -./v2 tests/test2048.pdf tmp.zst +make clean multi +./multi tests/test2048.pdf tmp.zst +zstd -d tmp.zst +diff tmp tests/test2048.pdf +echo "diff test complete" +make clean diff --git a/contrib/adaptive-compression/v1.c b/contrib/adaptive-compression/single.c similarity index 100% rename from contrib/adaptive-compression/v1.c rename to contrib/adaptive-compression/single.c