tor

commit b65166750d656f6f503e569f733b1f6c10d1c7f4
parent c4c372f28151094b8f86337d2fecc269d7802038
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 11 Dec 2018 09:25:46 -0500

Merge remote-tracking branch 'rl1987/ticket28007_take2'

Diffstat:
A
changes/ticket28007
 | 
3
+++
M
scripts/test/scan-build.sh
 | 
5
+++++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/ticket28007 b/changes/ticket28007
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+    - Cleanup scan-build.sh to silence shellcheck warnings.
+      Closes ticket 28007.
diff --git a/scripts/test/scan-build.sh b/scripts/test/scan-build.sh
@@ -33,6 +33,7 @@ CHECKERS="\
     -enable-checker security.insecureAPI.strcpy \
 "
 
+# shellcheck disable=SC2034
 # These have high false-positive rates.
 EXTRA_CHECKERS="\
     -enable-checker alpha.security.ArrayBoundV2 \
@@ -40,6 +41,7 @@ EXTRA_CHECKERS="\
     -enable-checker alpha.core.CastSize \
 "
 
+# shellcheck disable=SC2034
 # These don't seem to generate anything useful
 NOISY_CHECKERS="\
     -enable-checker alpha.clone.CloneChecker \
@@ -52,6 +54,7 @@ else
    OUTPUTARG=""
 fi
 
+# shellcheck disable=SC2086
 scan-build \
     $CHECKERS \
     ./configure
@@ -61,11 +64,13 @@ scan-build \
 
 # Make this not get scanned for dead assignments, since it has lots of
 # dead assignments we don't care about.
+# shellcheck disable=SC2086
 scan-build \
     $CHECKERS \
     -disable-checker deadcode.DeadStores \
     make -j5 -k ./src/ext/ed25519/ref10/libed25519_ref10.a
 
+# shellcheck disable=SC2086
 scan-build \
     $CHECKERS $OUTPUTARG \
     make -j5 -k