From 8081abe26ac9d16dd3b600b0aac7ec8fbf1a6080 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 28 Nov 2019 18:08:49 +0100 Subject: [PATCH] CLEANUP: connection: conn->xprt is never NULL Let's remove this outdated test that's been there since 1.5. For quite some time now xprt hasn't been NULL anymore on an initialized connection. --- src/connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/connection.c b/src/connection.c index 320a387d7..6c8855fd5 100644 --- a/src/connection.c +++ b/src/connection.c @@ -71,7 +71,7 @@ void conn_fd_handler(int fd) conn->xprt_done_cb && conn->xprt_done_cb(conn) < 0) return; - if (conn->xprt && fd_send_ready(fd) && fd_send_active(fd)) { + if (fd_send_ready(fd) && fd_send_active(fd)) { /* force reporting of activity by clearing the previous flags : * we'll have at least ERROR or CONNECTED at the end of an I/O, * both of which will be detected below. @@ -99,7 +99,7 @@ void conn_fd_handler(int fd) * that we must absolutely test conn->xprt at each step in case it suddenly * changes due to a quick unexpected close(). */ - if (conn->xprt && fd_recv_ready(fd) && fd_recv_active(fd)) { + if (fd_recv_ready(fd) && fd_recv_active(fd)) { /* force reporting of activity by clearing the previous flags : * we'll have at least ERROR or CONNECTED at the end of an I/O, * both of which will be detected below.