From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Fri, 11 Jan 2019 10:47:12 +0000 (+0100)
Subject: MINOR: cfgparse: Simplication.
X-Git-Tag: v2.0-dev1~188
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9492c4ecdbb866e1944809bc06fb8705483f1236;p=thirdparty%2Fhaproxy.git

MINOR: cfgparse: Simplication.

Make init_peers_frontend() be callable without having to check if
there is something to do or not.

May be backported to 1.5 and newer.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index a391b82353..e5831a5dc9 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -491,6 +491,10 @@ static int init_peers_frontend(const char *file, int linenum,
 {
 	struct proxy *p;
 
+	if (peers->peers_fe)
+		/* Nothing to do */
+		return 0;
+
 	p = calloc(1, sizeof *p);
 	if (!p) {
 		ha_alert("parsing [%s:%d] : out of memory.\n", file, linenum);
@@ -658,8 +662,7 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
 		/* Current is local peer, it define a frontend */
 		newpeer->local = 1;
 
-		if (!curpeers->peers_fe &&
-		    init_peers_frontend(file, linenum, args[1], curpeers) != 0) {
+		if (init_peers_frontend(file, linenum, args[1], curpeers) != 0) {
 				ha_alert("parsing [%s:%d] : out of memory.\n", file, linenum);
 				err_code |= ERR_ALERT | ERR_ABORT;
 				goto out;