diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-05-03 13:11:03 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-05-03 13:11:03 -0400 |
| commit | 2aa441b88e089c9aa650f25dd1b109bf14bc451d (patch) | |
| tree | 16b224c09b42cd4216656c9984ed00830812c12e | |
| parent | b3492d53c3f643a1e6b2e62bb8b2ad5bfa77213e (diff) | |
| parent | 3105081c2f075409f182d497eb101e3a690bb2f7 (diff) | |
| download | tor-2aa441b88e089c9aa650f25dd1b109bf14bc451d.tar.gz tor-2aa441b88e089c9aa650f25dd1b109bf14bc451d.zip | |
Merge branch 'tor-github/pr/954'
| -rw-r--r-- | src/lib/log/util_bug.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 2e220b7286..fb223b35f4 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -143,12 +143,13 @@ #ifdef ALL_BUGS_ARE_FATAL #define tor_assert_nonfatal_unreached() tor_assert(0) #define tor_assert_nonfatal(cond) tor_assert((cond)) -#define tor_assertf_nonfatal(cond, fmt, ...) tor_assertf(cond, fmt, ...) +#define tor_assertf_nonfatal(cond, fmt, ...) \ + tor_assertf(cond, fmt, ##__VA_ARGS__) #define tor_assert_nonfatal_unreached_once() tor_assert(0) #define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define BUG(cond) \ (ASSERT_PREDICT_UNLIKELY_(cond) ? \ - (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ + (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",NULL), \ tor_abort_(), 1) \ : 0) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) |