Skip to content
This repository was archived by the owner on Aug 13, 2025. It is now read-only.

Commit b2b3899

Browse files
committed
Fix cmocka-related compiler warnings in ht_test
tests/isc/ht_test.c triggers the following compiler warnings when built against development versions of cmocka: In file included from ht_test.c:24: ht_test.c: In function ‘test_ht_full’: ht_test.c:69:45: warning: passing argument 2 of ‘_assert_ptr_equal’ makes pointer from integer without a cast [-Wint-conversion] 69 | assert_ptr_equal((void *)i, (uintptr_t)f); /usr/include/cmocka.h:1513:56: note: in definition of macro ‘assert_ptr_equal’ 1513 | #define assert_ptr_equal(a, b) _assert_ptr_equal((a), (b), __FILE__, __LINE__) | ^ /usr/include/cmocka.h:2907:36: note: expected ‘const void *’ but argument is of type ‘long unsigned int’ 2907 | const void *b, | ~~~~~~~~~~~~^ ht_test.c:164:45: warning: passing argument 2 of ‘_assert_ptr_equal’ makes pointer from integer without a cast [-Wint-conversion] 164 | assert_ptr_equal((void *)i, (uintptr_t)f); /usr/include/cmocka.h:1513:56: note: in definition of macro ‘assert_ptr_equal’ 1513 | #define assert_ptr_equal(a, b) _assert_ptr_equal((a), (b), __FILE__, __LINE__) | ^ /usr/include/cmocka.h:2907:36: note: expected ‘const void *’ but argument is of type ‘long unsigned int’ 2907 | const void *b, | ~~~~~~~~~~~~^ These are caused by a change to the definitions of pointer assert functions in cmocka's development branch [1]. Fix by casting the affected variables to (void *) instead of (uintptr_t). [1] https://git.cryptomilk.org/projects/cmocka.git/commit/?id=09621179af67535788a67957a910d9f17c975b45 (cherry picked from commit 8d36e68)
1 parent 78afc0b commit b2b3899

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tests/isc/ht_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ test_ht_full(int bits, uintptr_t count) {
6666
strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
6767
result = isc_ht_find(ht, key, 16, &f);
6868
assert_int_equal(result, ISC_R_SUCCESS);
69-
assert_ptr_equal((void *)i, (uintptr_t)f);
69+
assert_ptr_equal((void *)i, (void *)f);
7070
}
7171

7272
for (i = 1; i < count; i++) {
@@ -161,7 +161,7 @@ test_ht_full(int bits, uintptr_t count) {
161161
strlcat((char *)key, " KEY of a raw hashtable!!", sizeof(key));
162162
result = isc_ht_find(ht, key, 16, &f);
163163
assert_int_equal(result, ISC_R_SUCCESS);
164-
assert_ptr_equal((void *)i, (uintptr_t)f);
164+
assert_ptr_equal((void *)i, (void *)f);
165165
}
166166

167167
for (i = 1; i < count; i++) {

0 commit comments

Comments
 (0)