upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-20 00:10:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

MINOR: cfgparse: Simplication.

Browse source 
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.
This commit is contained in:
Frdric Lcaille 2019-01-11 11:47:12 +01:00 committed by Willy Tarreau
parent 91694d51f7
commit 9492c4ecdb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/cfgparse.c
View file

@ -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;