From dfee217b68a241f2723c2a4b67d2af187f0b6690 Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Fri, 18 Jun 2021 19:57:49 +0000 Subject: [PATCH] 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. --- src/check.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/check.c b/src/check.c index 9c885eaad..aef1a151d 100644 --- a/src/check.c +++ b/src/check.c @@ -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 */