Merge branch 'michal/cmocka-future-proofing-9.18' into 'bind-9.18'

kempniu · kempniu · commit 66a8a0de2344 · 2023-05-18T13:51:35.000Z
[9.18] cmocka future-proofing

See merge request isc-projects/bind9!7947
diff --git a/tests/dns/acl_test.c b/tests/dns/acl_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/db_test.c b/tests/dns/db_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/dbdiff_test.c b/tests/dns/dbdiff_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/dbiterator_test.c b/tests/dns/dbiterator_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/dbversion_test.c b/tests/dns/dbversion_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/dh_test.c b/tests/dns/dh_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/dns64_test.c b/tests/dns/dns64_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/dst_test.c b/tests/dns/dst_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/geoip_test.c b/tests/dns/geoip_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/master_test.c b/tests/dns/master_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/nsec3_test.c b/tests/dns/nsec3_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/nsec3param_test.c b/tests/dns/nsec3param_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/rbtdb_test.c b/tests/dns/rbtdb_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/rdataset_test.c b/tests/dns/rdataset_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/resolver_test.c b/tests/dns/resolver_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/rsa_test.c b/tests/dns/rsa_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/sigs_test.c b/tests/dns/sigs_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/tsig_test.c b/tests/dns/tsig_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/zonemgr_test.c b/tests/dns/zonemgr_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/dns/zt_test.c b/tests/dns/zt_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/irs/resconf_test.c b/tests/irs/resconf_test.c
@@ -13,6 +13,7 @@
 
 #if HAVE_CMOCKA
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/aes_test.c b/tests/isc/aes_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/buffer_test.c b/tests/isc/buffer_test.c
@@ -12,6 +12,7 @@
  */
 
 #include <fcntl.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
diff --git a/tests/isc/counter_test.c b/tests/isc/counter_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/crc64_test.c b/tests/isc/crc64_test.c
@@ -13,6 +13,7 @@
 
 /* ! \file */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/errno_test.c b/tests/isc/errno_test.c
@@ -12,6 +12,7 @@
  */
 
 #include <errno.h>
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/file_test.c b/tests/isc/file_test.c
@@ -12,6 +12,7 @@
  */
 
 #include <fcntl.h>
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/heap_test.c b/tests/isc/heap_test.c
@@ -13,6 +13,7 @@
 
 /* ! \file */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/hmac_test.c b/tests/isc/hmac_test.c
@@ -13,6 +13,7 @@
 
 /* ! \file */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/ht_test.c b/tests/isc/ht_test.c
@@ -66,7 +66,7 @@ test_ht_full(int bits, uintptr_t count) {
 		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
 		result = isc_ht_find(ht, key, 16, &f);
 		assert_int_equal(result, ISC_R_SUCCESS);
-		assert_ptr_equal((void *)i, (uintptr_t)f);
+		assert_ptr_equal((void *)i, (void *)f);
 	}
 
 	for (i = 1; i < count; i++) {
@@ -161,7 +161,7 @@ test_ht_full(int bits, uintptr_t count) {
 		strlcat((char *)key, " KEY of a raw hashtable!!", sizeof(key));
 		result = isc_ht_find(ht, key, 16, &f);
 		assert_int_equal(result, ISC_R_SUCCESS);
-		assert_ptr_equal((void *)i, (uintptr_t)f);
+		assert_ptr_equal((void *)i, (void *)f);
 	}
 
 	for (i = 1; i < count; i++) {
diff --git a/tests/isc/lex_test.c b/tests/isc/lex_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/md_test.c b/tests/isc/md_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/netaddr_test.c b/tests/isc/netaddr_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/netmgr_test.c b/tests/isc/netmgr_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <signal.h>
diff --git a/tests/isc/pool_test.c b/tests/isc/pool_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/quota_test.c b/tests/isc/quota_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/radix_test.c b/tests/isc/radix_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/regex_test.c b/tests/isc/regex_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/result_test.c b/tests/isc/result_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/safe_test.c b/tests/isc/safe_test.c
@@ -13,6 +13,7 @@
 
 /* ! \file */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/siphash_test.c b/tests/isc/siphash_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <sched.h>
 #include <setjmp.h>
diff --git a/tests/isc/sockaddr_test.c b/tests/isc/sockaddr_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/stats_test.c b/tests/isc/stats_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/symtab_test.c b/tests/isc/symtab_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/taskpool_test.c b/tests/isc/taskpool_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isc/time_test.c b/tests/isc/time_test.c
@@ -11,6 +11,7 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
diff --git a/tests/isccfg/duration_test.c b/tests/isccfg/duration_test.c
@@ -11,11 +11,11 @@
  * information regarding copyright ownership.
  */
 
+#include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/isccfg/parser_test.c b/tests/isccfg/parser_test.c
diff --git a/tests/ns/listenlist_test.c b/tests/ns/listenlist_test.c
diff --git a/tests/ns/notify_test.c b/tests/ns/notify_test.c
diff --git a/tests/ns/plugin_test.c b/tests/ns/plugin_test.c
