From: Gaetan Rivet <grive@u256.net>
Date: Fri, 28 Feb 2020 10:04:21 +0000 (+0100)
Subject: MINOR: checks: Simplify connection flag parsing in tcp-check connect
X-Git-Tag: v2.2-dev7~177
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08fdcb3ecbfbf56001f283f3289166a16608026f;p=thirdparty%2Fhaproxy.git

MINOR: checks: Simplify connection flag parsing in tcp-check connect

The ternary operator is useless here, this can be simpler and clearer to
read.
---

diff --git a/src/checks.c b/src/checks.c
index a685d07c9d..4470c8f4a3 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -2977,9 +2977,14 @@ static int tcpcheck_main(struct check *check)
 			cs_attach(cs, check, &check_conn_cb);
 
 			ret = SF_ERR_INTERNAL;
-			if (proto && proto->connect)
-				ret = proto->connect(conn,
-						     CONNECT_HAS_DATA /* I/O polling is always needed */ | ((next && next->action == TCPCHK_ACT_EXPECT) ? 0 : CONNECT_DELACK_ALWAYS));
+			if (proto && proto->connect) {
+				int flags;
+
+				flags = CONNECT_HAS_DATA;
+				if (next && next->action != TCPCHK_ACT_EXPECT)
+					flags |= CONNECT_DELACK_ALWAYS;
+				ret = proto->connect(conn, flags);
+			}
 			if (conn_ctrl_ready(conn) &&
 				check->current_step->conn_opts & TCPCHK_OPT_SEND_PROXY) {
 				conn->send_proxy_ofs = 1;