system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 02:05:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Reorder arguments for calloc()-like functions, part #2

Browse source 
To appease gcc-14's -Wcalloc-transposed-args check.

Follow-up for 2a9ab0974b.
This commit is contained in:
Frantisek Sumsal 2024-01-16 22:42:39 +01:00
parent b551a687a4
commit fdd84270df
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/basic/alloc-util.h
View file

@ -47,7 +47,7 @@ typedef void* (*mfree_func_t)(void *p);
#define newdup(t, p, n) ((t*) memdup_multiply(p, (n), sizeof(t)))
#define newdup_suffix0(t, p, n) ((t*) memdup_suffix0_multiply(p, sizeof(t), (n)))
#define newdup_suffix0(t, p, n) ((t*) memdup_suffix0_multiply(p, (n), sizeof(t)))
#define malloc0(n) (calloc(1, (n) ?: 1))
@ -137,7 +137,7 @@ _alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t need, si
/* Note that we can't decorate this function with _alloc_() since the returned memory area is one byte larger
* than the product of its parameters. */
static inline void *memdup_suffix0_multiply(const void *p, size_t size, size_t need) {
static inline void *memdup_suffix0_multiply(const void *p, size_t need, size_t size) {
if (size_multiply_overflow(size, need))
return NULL;

4
src/boot/efi/util.h
View file

@ -36,7 +36,7 @@ static inline void *xmalloc(size_t size) {
}
_malloc_ _alloc_(1, 2) _returns_nonnull_ _warn_unused_result_
static inline void *xmalloc_multiply(size_t size, size_t n) {
static inline void *xmalloc_multiply(size_t n, size_t size) {
assert_se(!__builtin_mul_overflow(size, n, &size));
return xmalloc(size);
}
@ -57,7 +57,7 @@ static inline void* xmemdup(const void *p, size_t l) {
return memcpy(xmalloc(l), p, l);
}
#define xnew(type, n) ((type *) xmalloc_multiply(sizeof(type), (n)))
#define xnew(type, n) ((type *) xmalloc_multiply((n), sizeof(type)))
typedef struct {
EFI_PHYSICAL_ADDRESS addr;

2
src/nspawn/nspawn-bind-user.c
View file

@ -286,7 +286,7 @@ int bind_user_prepare(
if (!sd)
return log_oom();
cm = reallocarray(*custom_mounts, sizeof(CustomMount), *n_custom_mounts + 1);
cm = reallocarray(*custom_mounts, *n_custom_mounts + 1, sizeof(CustomMount));
if (!cm)
return log_oom();

4
src/test/test-alloc-util.c
View file

@ -100,7 +100,7 @@ TEST(memdup_multiply_and_greedy_realloc) {
size_t i;
int *p;
dup = memdup_suffix0_multiply(org, sizeof(int), 3);
dup = memdup_suffix0_multiply(org, 3, sizeof(int));
assert_se(dup);
assert_se(dup[0] == 1);
assert_se(dup[1] == 2);
@ -108,7 +108,7 @@ TEST(memdup_multiply_and_greedy_realloc) {
assert_se(((uint8_t*) dup)[sizeof(int) * 3] == 0);
free(dup);
dup = memdup_multiply(org, sizeof(int), 3);
dup = memdup_multiply(org, 3, sizeof(int));
assert_se(dup);
assert_se(dup[0] == 1);
assert_se(dup[1] == 2);