`pool_free()` is a noop when the given pointer is NULL. No need to test.
---
 include/haproxy/connection.h | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index e00e6f820..58b0d0e7b 100644
--- a/include/haproxy/connection.h
+++ b/include/haproxy/connection.h
@@ -553,18 +553,14 @@ static inline void conn_free(struct connection *conn)
        sockaddr_free(&conn->src);
        sockaddr_free(&conn->dst);
 
-       if (conn->proxy_authority != NULL) {
-               pool_free(pool_head_authority, conn->proxy_authority);
-               conn->proxy_authority = NULL;
-       }
-       if (isttest(conn->proxy_unique_id)) {
-               pool_free(pool_head_uniqueid, conn->proxy_unique_id.ptr);
-               conn->proxy_unique_id = IST_NULL;
-       }
-       if (conn->hash_node) {
-               pool_free(pool_head_conn_hash_node, conn->hash_node);
-               conn->hash_node = NULL;
-       }
+       pool_free(pool_head_authority, conn->proxy_authority);
+       conn->proxy_authority = NULL;
+
+       pool_free(pool_head_uniqueid, conn->proxy_unique_id.ptr);
+       conn->proxy_unique_id = IST_NULL;
+
+       pool_free(pool_head_conn_hash_node, conn->hash_node);
+       conn->hash_node = NULL;
 
        /* By convention we always place a NULL where the ctx points to if the
         * mux is null. It may have been used to store the connection as a
-- 
2.30.1


Reply via email to