nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ticket26890'

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-30 09:08:39 -04:00
commit 70b16bc679
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/log/util_bug.c
View File

@ -20,10 +20,6 @@
#include <string.h> #include <string.h>
#ifdef __COVERITY__
int bug_macro_deadcode_dummy__ = 0;
#endif
#ifdef TOR_UNIT_TESTS #ifdef TOR_UNIT_TESTS
static void (*failed_assertion_cb)(void) = NULL; static void (*failed_assertion_cb)(void) = NULL;
static int n_bugs_to_capture = 0; static int n_bugs_to_capture = 0;

3
src/lib/log/util_bug.h
View File

@ -86,13 +86,12 @@
*/ */
#ifdef __COVERITY__ #ifdef __COVERITY__
extern int bug_macro_deadcode_dummy__;
#undef BUG #undef BUG
// Coverity defines this in global headers; let's override it. This is a // Coverity defines this in global headers; let's override it. This is a
// magic coverity-only preprocessor thing. // magic coverity-only preprocessor thing.
// We use this "deadcode_dummy__" trick to prevent coverity from // We use this "deadcode_dummy__" trick to prevent coverity from
// complaining about unreachable bug cases. // complaining about unreachable bug cases.
#nodef BUG(x) ((x)?(__coverity_panic__(),1):(0+bug_macro_deadcode_dummy__)) #nodef BUG(x) (x)
#endif /* defined(__COVERITY__) */ #endif /* defined(__COVERITY__) */
#if defined(__COVERITY__) || defined(__clang_analyzer__) #if defined(__COVERITY__) || defined(__clang_analyzer__)