From 668a972d1e71ccc7282601906dff4bc4bb3a7d1c Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 30 Jan 2020 17:14:42 +1100 Subject: [PATCH] simplify RUNTIME_CHECK for cppcheck --- lib/isc/include/isc/util.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h index c4a872cba7c..20f107b8c62 100644 --- a/lib/isc/include/isc/util.h +++ b/lib/isc/include/isc/util.h @@ -285,12 +285,17 @@ extern void mock_assert(const int result, const char* const expression, #ifdef UNIT_TESTING #define RUNTIME_CHECK(expression) \ - mock_assert((int)(expression), #expression, __FILE__, __LINE__) + ((!(expression)) ? \ + (mock_assert(0, #expression, __FILE__, __LINE__), abort()) : (void)0) #else /* UNIT_TESTING */ +#ifndef CPPCHECK /*% Runtime Check */ #define RUNTIME_CHECK(cond) ISC_ERROR_RUNTIMECHECK(cond) +#else +#define RUNTIME_CHECK(e) if (!(e)) abort() +#endif #endif /* UNIT_TESTING */ -- 2.47.3