From caba2cc0f5bc7b85c74b5868ea3aa3b8d1365391 Mon Sep 17 00:00:00 2001
From: Yann Collet <yann.collet.73@gmail.com>
Date: Sat, 27 Jun 2015 13:21:33 -0800
Subject: staticAnalyze use same compilation flags as normal build

---
 Makefile          |  2 +-
 NEWS              |  3 ++-
 programs/lz4cli.c | 11 ++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 114ca67..9113e5f 100644
--- a/Makefile
+++ b/Makefile
@@ -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"
diff --git a/NEWS b/NEWS
index b403d0f..569f54b 100644
--- a/NEWS
+++ b/NEWS
@@ -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;
 }
-- 
cgit v0.12