MINOR: connection: improve list api usage

Replace !LIST_ISEMPTY by LIST_ADDED and LIST_DEL+LIST_INIT by
LIST_DEL_INIT for connection session list.

diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index 2e01a2d546baf73884665fbea29ebb6f6e24323e..37d3f4280fd4b7e8137231e87268237be36b7b7f 100644 (file)
--- a/include/haproxy/connection.h
+++ b/include/haproxy/connection.h
@@ -468,7 +468,7 @@ static inline void conn_free(struct connection *conn)
                /* The connection is private, so remove it from the session's
                 * connections list, if any.
                 */
-               if (!LIST_ISEMPTY(&conn->session_list))
+               if (LIST_ADDED(&conn->session_list))
                        session_unown_conn(conn->owner, conn);
        }
        else {

diff --git a/include/haproxy/session.h b/include/haproxy/session.h
index 05c56f6024ed5425ac91ce7db6b1edc105ace998..59945b2ba48fff989ea0b1908ab5f08a25fa878f 100644 (file)
--- a/include/haproxy/session.h
+++ b/include/haproxy/session.h
@@ -80,8 +80,7 @@ static inline void session_unown_conn(struct session *sess, struct connection *c
 
        if (conn->flags & CO_FL_SESS_IDLE)
                sess->idle_conns--;
-       LIST_DEL(&conn->session_list);
-       LIST_INIT(&conn->session_list);
+       LIST_DEL_INIT(&conn->session_list);
        list_for_each_entry(srv_list, &sess->srv_list, srv_list) {
                if (srv_list->target == conn->target) {
                        if (LIST_ISEMPTY(&srv_list->conn_list)) {