From: Tim Duesterhus <tim@bastelstu.be>
Date: Wed, 15 Sep 2021 11:58:46 +0000 (+0200)
Subject: CLEANUP: Apply xalloc_size.cocci
X-Git-Tag: v2.5-dev8~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec4a8754da59e00b6313dbc10a081badfb37bf33;p=thirdparty%2Fhaproxy.git

CLEANUP: Apply xalloc_size.cocci

This fixes a few locations with a hardcoded type within `sizeof()`.
---

diff --git a/include/haproxy/listener.h b/include/haproxy/listener.h
index 1c37d34daa..2212ca9271 100644
--- a/include/haproxy/listener.h
+++ b/include/haproxy/listener.h
@@ -179,7 +179,7 @@ unsigned int bind_map_thread_id(const struct bind_conf *conf, unsigned int r);
 static inline struct bind_conf *bind_conf_alloc(struct proxy *fe, const char *file,
                                  int line, const char *arg, struct xprt_ops *xprt)
 {
-	struct bind_conf *bind_conf = calloc(1, sizeof(struct bind_conf));
+	struct bind_conf *bind_conf = calloc(1, sizeof(*bind_conf));
 
 	if (!bind_conf)
 		goto err;
diff --git a/src/errors.c b/src/errors.c
index d2eafcea48..993b6ae582 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -126,7 +126,7 @@ static void generate_usermsgs_ctx_str(void)
 	int ret;
 
 	if (unlikely(b_is_null(&ctx->str))) {
-		area = calloc(USERMSGS_CTX_BUFSIZE, sizeof(char));
+		area = calloc(USERMSGS_CTX_BUFSIZE, sizeof(*area));
 		if (area)
 			ctx->str = b_make(area, USERMSGS_CTX_BUFSIZE, 0, 0);
 	}