teach cppcheck that _assert_int_equal and _assert_int_not_equal don't return on failure

(cherry picked from commit 5d5d751c7f93c5f524661efaa9ad9cd32fa39da6)

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 014be2a0d07c1659caa5eae6ac8fe8c68a85d5bd..973c34862fa5e8b3a90ab2a59c2e79c1b209d107 100644 (file)
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -242,6 +242,10 @@ extern void mock_assert(const int result, const char* const expression,
        (mock_assert(0, #expression, __FILE__, __LINE__), abort()) : (void)0)
 #define _assert_true(c, e, f, l) \
        ((c) ? (void)0 : (_assert_true(0, e, f, l), abort()))
+#define _assert_int_equal(a, b, f, l) \
+       (((a) == (b)) ? (void)0 : (_assert_int_equal(a, b, f, l), abort()))
+#define _assert_int_not_equal(a, b, f, l) \
+       (((a) != (b)) ? (void)0 : (_assert_int_not_equal(a, b, f, l), abort()))
 #else /* UNIT_TESTING */
 /*
  * Assertions

diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c
index 76530e73257e9d47dd214cacf7a78c915b4a595d..5d950944cd2714f665c6fbe146ceaa61763802ba 100644 (file)
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -13,9 +13,10 @@
 
 #if HAVE_CMOCKA
 
+#include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <setjmp.h>
+#include <stdlib.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/isc/tests/errno_test.c b/lib/isc/tests/errno_test.c
index c2d25cffa64f46c051967c0ed36958a408fecaf0..6c1ccfe084f97585d924d61a1bd31e4f1940b804 100644 (file)
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -13,9 +13,10 @@
 
 #if HAVE_CMOCKA
 
+#include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <setjmp.h>
+#include <stdlib.h>
 
 #include <string.h>
 #include <sys/errno.h>