yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tests: fix calloc() argument list (gcc-14 fix)

Browse source 
`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
detected minor infelicity in `calloc()` API usage in `mbedtls`:

    In file included from /build/mbedtls/tests/include/test/ssl_helpers.h:19,
                     from /build/mbedtls/tests/src/test_helpers/ssl_helpers.c:11:
    /build/mbedtls/tests/src/test_helpers/ssl_helpers.c: In function 'mbedtls_test_init_handshake_options':
    /build/mbedtls/tests/include/test/macros.h:128:46:
      error: 'calloc' sizes specified with 'sizeof' in the earlier argument
        and not in the later argument [-Werror=calloc-transposed-args]
      128 |             (pointer) = mbedtls_calloc(sizeof(*(pointer)),  \
          |                                              ^

Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
This commit is contained in:
Sergei Trofimovich 2024-01-25 20:48:56 +00:00
parent f5e231ca84
commit da2a33de0f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/include/test/macros.h
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)