From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Thu, 22 Feb 2024 14:08:33 +0000 (+0100)
Subject: CLEANUP: log: use free_logformat_list() in parse_logformat_string()
X-Git-Tag: v3.0-dev4~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62121d5b90e975982b7bbec095b57f78a55e60a7;p=thirdparty%2Fhaproxy.git

CLEANUP: log: use free_logformat_list() in parse_logformat_string()

This is a follow up for 24a5e42db6 ("CLEANUP: log: deinitialization of
the log buffer in one function") as there was another opportunity to
make use of the new cleanup function.
---

diff --git a/src/log.c b/src/log.c
index 7e68039443..b0d0221643 100644
--- a/src/log.c
+++ b/src/log.c
@@ -515,7 +515,6 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 	int typecast = SMP_T_SAME; /* relaxed by default */
 	int cformat; /* current token format */
 	int pformat; /* previous token format */
-	struct logformat_node *tmplf, *back;
 
 	sp = str = backfmt = strdup(fmt);
 	if (!str) {
@@ -525,12 +524,7 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 	curproxy->to_log |= LW_INIT;
 
 	/* flush the list first. */
-	list_for_each_entry_safe(tmplf, back, list_format, list) {
-		LIST_DELETE(&tmplf->list);
-		release_sample_expr(tmplf->expr);
-		free(tmplf->arg);
-		free(tmplf);
-	}
+	free_logformat_list(list_format);
 
 	for (cformat = LF_INIT; cformat != LF_END; str++) {
 		pformat = cformat;