From: Mark Andrews <marka@isc.org>
Date: Tue, 16 Apr 2019 05:03:18 +0000 (+1000)
Subject: teach cppcheck that _assert_int_equal and _assert_int_not_equal don't return on failure
X-Git-Tag: v9.11.9~28^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0c0ddaf3d163b471b50b836f82ed43dc715e3875;p=thirdparty%2Fbind9.git

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 014be2a0d07..973c34862fa 100644
--- 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 76530e73257..5d950944cd2 100644
--- 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 c2d25cffa64..6c1ccfe084f 100644
--- 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>