mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
60 lines
3.1 KiB
Diff
60 lines
3.1 KiB
Diff
From da2a33de0f2d0f7f179220d1a92f788d1459c3e3 Mon Sep 17 00:00:00 2001
|
|
From: Sergei Trofimovich <slyich@gmail.com>
|
|
Date: Thu, 25 Jan 2024 20:48:56 +0000
|
|
Subject: [PATCH] tests: fix `calloc()` argument list (`gcc-14` fix)
|
|
|
|
`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>
|
|
---
|
|
tests/include/test/macros.h | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/tests/include/test/macros.h b/tests/include/test/macros.h
|
|
index 8de9c4d95298..a73e06fca8cd 100644
|
|
--- a/tests/include/test/macros.h
|
|
+++ b/tests/include/test/macros.h
|
|
@@ -125,8 +125,8 @@
|
|
do { \
|
|
TEST_ASSERT((pointer) == NULL); \
|
|
if ((item_count) != 0) { \
|
|
- (pointer) = mbedtls_calloc(sizeof(*(pointer)), \
|
|
- (item_count)); \
|
|
+ (pointer) = mbedtls_calloc((item_count), \
|
|
+ sizeof(*(pointer))); \
|
|
TEST_ASSERT((pointer) != NULL); \
|
|
} \
|
|
} while (0)
|
|
@@ -155,8 +155,8 @@
|
|
#define TEST_CALLOC_NONNULL(pointer, item_count) \
|
|
do { \
|
|
TEST_ASSERT((pointer) == NULL); \
|
|
- (pointer) = mbedtls_calloc(sizeof(*(pointer)), \
|
|
- (item_count)); \
|
|
+ (pointer) = mbedtls_calloc((item_count), \
|
|
+ sizeof(*(pointer))); \
|
|
if (((pointer) == NULL) && ((item_count) == 0)) { \
|
|
(pointer) = mbedtls_calloc(1, 1); \
|
|
} \
|
|
@@ -175,8 +175,8 @@
|
|
do { \
|
|
TEST_ASSERT((pointer) == NULL); \
|
|
if ((item_count) != 0) { \
|
|
- (pointer) = mbedtls_calloc(sizeof(*(pointer)), \
|
|
- (item_count)); \
|
|
+ (pointer) = mbedtls_calloc((item_count), \
|
|
+ sizeof(*(pointer))); \
|
|
TEST_ASSUME((pointer) != NULL); \
|
|
} \
|
|
} while (0)
|