diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | programs/lz4cli.c | 11 |
3 files changed, 9 insertions, 7 deletions
@@ -112,7 +112,7 @@ sanitize: clean $(MAKE) test CC=clang CPPFLAGS="-g -fsanitize=undefined" FUZZER_TIME="-T1mn" NB_LOOPS=-i1 staticAnalyze: clean - scan-build --status-bugs -v $(MAKE) all CFLAGS=-g + CPPFLAGS=-g scan-build --status-bugs -v $(MAKE) all armtest: clean cd lib; $(MAKE) -e all CC=arm-linux-gnueabi-gcc CPPFLAGS="-Werror" @@ -1,5 +1,6 @@ r131 -Added : Example using lz4frame library, by Zbigniew Jędrzejewski-Szmek (#118) +Added : Example using lz4frame library, by Zbigniew Jędrzejewski-Szmek (#118) +Changed: xxhash symbols are modified (namespace emulation) within liblz4 r130: Fixed : incompatibility sparse mode vs console, reported by Yongwoon Cho (#105) diff --git a/programs/lz4cli.c b/programs/lz4cli.c index 32ce4f3..977c04e 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -197,6 +197,7 @@ static int usage_advanced(void) static int usage_longhelp(void) { + usage_advanced(); DISPLAY( "\n"); DISPLAY( "Which values can get [output] ? \n"); DISPLAY( "[output] : a filename\n"); @@ -357,9 +358,9 @@ int main(int argc, char** argv) switch(argument[0]) { /* Display help */ - case 'V': DISPLAY(WELCOME_MESSAGE); return 0; /* Version */ - case 'h': usage_advanced(); return 0; - case 'H': usage_advanced(); usage_longhelp(); return 0; + case 'V': DISPLAY(WELCOME_MESSAGE); goto _cleanup; /* Version */ + case 'h': usage_advanced(); goto _cleanup; + case 'H': usage_longhelp(); goto _cleanup; /* Compression (default) */ case 'z': forceCompress = 1; break; @@ -557,9 +558,9 @@ int main(int argc, char** argv) } } +_cleanup: if (main_pause) waitEnter(); free(dynNameSpace); free((void*)inFileNames); - if (operationResult != 0) return operationResult; - return 0; + return operationResult; } |