RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: checks: return correct error code for srv_parse_agent_check 

In srv_parse_agent_check the error code is not returned in case
something goes wrong. The value 0 is always return.

Additionally, there's a small cleanup of unreachable returns that in
most checks are not present either and removed in two places they were
present. This makes the code consistent across the different checks.
This commit is contained in:
Dirkjan Bussink 2021-06-18 19:57:49 +00:00 committed by Willy Tarreau
parent 07ecff589d
commit dfee217b68
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/check.c
View File

@ -1897,7 +1897,7 @@ static int srv_parse_agent_check(char **args, int *cur_arg, struct proxy *curpx,
srv->do_agent = 1;
out:
return 0;
return err_code;
error:
deinit_srv_agent_check(srv);
@ -2155,7 +2155,6 @@ static int srv_parse_check_rise(char **args, int *cur_arg, struct proxy *curpx,
deinit_srv_agent_check(srv);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
return 0;
}
/* Parse the "fall" server keyword */
@ -2182,7 +2181,6 @@ static int srv_parse_check_fall(char **args, int *cur_arg, struct proxy *curpx,
deinit_srv_agent_check(srv);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
return 0;
}
/* Parse the "inter" server keyword */