From: Willy Tarreau <w@1wt.eu>
Date: Mon, 22 Mar 2021 20:11:45 +0000 (+0100)
Subject: CLEANUP: tcpcheck: use pool_zalloc() instead of pool_alloc+memset
X-Git-Tag: v2.4-dev14~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6922e550eb9982481bb6f47fe4267f03e0641069;p=thirdparty%2Fhaproxy.git

CLEANUP: tcpcheck: use pool_zalloc() instead of pool_alloc+memset

Two places used to alloc then zero the area, let's have the allocator do it.
---

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index 90f1ee953a..52b47eed47 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -3618,9 +3618,8 @@ int add_tcpcheck_expect_str(struct tcpcheck_rules *rules, const char *str)
 	struct tcpcheck_rule *tcpcheck, *prev_check;
 	struct tcpcheck_expect *expect;
 
-	if ((tcpcheck = pool_alloc(pool_head_tcpcheck_rule)) == NULL)
+	if ((tcpcheck = pool_zalloc(pool_head_tcpcheck_rule)) == NULL)
 		return 0;
-	memset(tcpcheck, 0, sizeof(*tcpcheck));
 	tcpcheck->action = TCPCHK_ACT_EXPECT;
 
 	expect = &tcpcheck->expect;
@@ -3661,9 +3660,8 @@ int add_tcpcheck_send_strs(struct tcpcheck_rules *rules, const char * const *str
 	char *dst;
 	int i;
 
-	if ((tcpcheck = pool_alloc(pool_head_tcpcheck_rule)) == NULL)
+	if ((tcpcheck = pool_zalloc(pool_head_tcpcheck_rule)) == NULL)
 		return 0;
-	memset(tcpcheck, 0, sizeof(*tcpcheck));
 	tcpcheck->action       = TCPCHK_ACT_SEND;
 
 	send = &tcpcheck->send;