RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-30 16:42:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: address a few remaining calloc(size, n) cases

Browse Source 
In issue #2427 Ilya reports that gcc-14 rightfully complains about
sizeof() being placed in the left term of calloc(). There's no impact
but it's a bad pattern that gets copy-pasted over time. Let's fix the
few remaining occurrences (debug.c, halog, udp-perturb).

This can be backported to all branches, and the irrelevant parts dropped.
This commit is contained in:
Willy Tarreau 2024-02-10 11:35:07 +01:00
parent 4559470728
commit ab8928b9db
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/halog/halog.c
View File

@ -410,7 +410,7 @@ struct timer *insert_timer(struct eb_root *r, struct timer **alloc, int v)
struct eb32_node *n;
if (!t) {
t = calloc(sizeof(*t), 1);
t = calloc(1, sizeof(*t));
if (unlikely(!t)) {
fprintf(stderr, "%s: not enough memory\n", __FUNCTION__);
exit(1);
@ -438,7 +438,7 @@ struct timer *insert_value(struct eb_root *r, struct timer **alloc, int v)
struct eb32_node *n;
if (!t) {
t = calloc(sizeof(*t), 1);
t = calloc(1, sizeof(*t));
if (unlikely(!t)) {
fprintf(stderr, "%s: not enough memory\n", __FUNCTION__);
exit(1);

2
dev/udp/udp-perturb.c
View File

@ -489,7 +489,7 @@ int main(int argc, char **argv)
if (addr_to_ss(argv[optind+1], &srv_addr, &err) < 0)
die(1, "parsing server address: %s\n", err.msg);
pfd = calloc(sizeof(struct pollfd), MAXCONN + 1);
pfd = calloc(MAXCONN + 1, sizeof(struct pollfd));
if (!pfd)
die(1, "out of memory\n");

4
src/debug.c
View File

@ -1293,7 +1293,7 @@ static int debug_parse_delay_inj(char **args, char *payload, struct appctx *appc
_HA_ATOMIC_INC(&debug_commands_issued);
tctx = calloc(sizeof(*tctx), 2);
tctx = calloc(2, sizeof(*tctx));
if (!tctx)
goto fail;
@ -1427,7 +1427,7 @@ static int debug_parse_cli_sched(char **args, char *payload, struct appctx *appc
*(uint8_t *)ptr = new;
}
tctx = calloc(sizeof(*tctx), count + 2);
tctx = calloc(count + 2, sizeof(*tctx));
if (!tctx)
goto fail;