tor

commit 70b16bc679435c5168d7d8f47a36d72bff24c0d8
parent ba1bb90a726ead9a5bb8a8fa6f14d31b06822258
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 30 Jul 2018 09:08:39 -0400

Merge branch 'ticket26890'

Diffstat:
M
src/lib/log/util_bug.c
 | 
4
----
M
src/lib/log/util_bug.h
 | 
3
+--

2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c
@@ -20,10 +20,6 @@
 
 #include <string.h>
 
-#ifdef __COVERITY__
-int bug_macro_deadcode_dummy__ = 0;
-#endif
-
 #ifdef TOR_UNIT_TESTS
 static void (*failed_assertion_cb)(void) = NULL;
 static int n_bugs_to_capture = 0;
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h
@@ -86,13 +86,12 @@
  */
 
 #ifdef __COVERITY__
-extern int bug_macro_deadcode_dummy__;
 #undef BUG
 // Coverity defines this in global headers; let's override it.  This is a
 // magic coverity-only preprocessor thing.
 // We use this "deadcode_dummy__" trick to prevent coverity from
 // complaining about unreachable bug cases.
-#nodef BUG(x) ((x)?(__coverity_panic__(),1):(0+bug_macro_deadcode_dummy__))
+#nodef BUG(x) (x)
 #endif /* defined(__COVERITY__) */
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)