Merge pull request #8751 from trofi/gcc-14-calloc-fix

tests: fix `calloc()` argument list (`gcc-14` fix)
This commit is contained in:
Paul Elliott 2024-01-26 11:02:53 +00:00 committed by GitHub
commit c4e911889e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -125,8 +125,8 @@
do { \ do { \
TEST_ASSERT((pointer) == NULL); \ TEST_ASSERT((pointer) == NULL); \
if ((item_count) != 0) { \ if ((item_count) != 0) { \
(pointer) = mbedtls_calloc(sizeof(*(pointer)), \ (pointer) = mbedtls_calloc((item_count), \
(item_count)); \ sizeof(*(pointer))); \
TEST_ASSERT((pointer) != NULL); \ TEST_ASSERT((pointer) != NULL); \
} \ } \
} while (0) } while (0)
@ -155,8 +155,8 @@
#define TEST_CALLOC_NONNULL(pointer, item_count) \ #define TEST_CALLOC_NONNULL(pointer, item_count) \
do { \ do { \
TEST_ASSERT((pointer) == NULL); \ TEST_ASSERT((pointer) == NULL); \
(pointer) = mbedtls_calloc(sizeof(*(pointer)), \ (pointer) = mbedtls_calloc((item_count), \
(item_count)); \ sizeof(*(pointer))); \
if (((pointer) == NULL) && ((item_count) == 0)) { \ if (((pointer) == NULL) && ((item_count) == 0)) { \
(pointer) = mbedtls_calloc(1, 1); \ (pointer) = mbedtls_calloc(1, 1); \
} \ } \
@ -175,8 +175,8 @@
do { \ do { \
TEST_ASSERT((pointer) == NULL); \ TEST_ASSERT((pointer) == NULL); \
if ((item_count) != 0) { \ if ((item_count) != 0) { \
(pointer) = mbedtls_calloc(sizeof(*(pointer)), \ (pointer) = mbedtls_calloc((item_count), \
(item_count)); \ sizeof(*(pointer))); \
TEST_ASSUME((pointer) != NULL); \ TEST_ASSUME((pointer) != NULL); \
} \ } \
} while (0) } while (0)