From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Mon, 13 Dec 2021 16:07:03 +0000 (+0100)
Subject: CLEANUP: quic: rename quic_conn conn to qc in quic_conn_free
X-Git-Tag: v2.6-dev1~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67e6cd50ef9cd2d08822626710671e0604bf7438;p=thirdparty%2Fhaproxy.git

CLEANUP: quic: rename quic_conn conn to qc in quic_conn_free

Rename quic_conn from conn to qc to differentiate it from a struct
connection instance. This convention is already used in the majority of
the code.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 04c315a993..6e30a363db 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -3232,28 +3232,28 @@ static int quic_conn_enc_level_init(struct quic_conn *qc,
 }
 
 /* Release all the memory allocated for <conn> QUIC connection. */
-static void quic_conn_free(struct quic_conn *conn)
+static void quic_conn_free(struct quic_conn *qc)
 {
 	int i;
 
-	if (!conn)
+	if (!qc)
 		return;
 
-	free_quic_conn_cids(conn);
+	free_quic_conn_cids(qc);
 
 	/* remove the connection from receiver cids trees */
-	HA_RWLOCK_WRLOCK(QUIC_LOCK, &conn->li->rx.cids_lock);
-	ebmb_delete(&conn->odcid_node);
-	ebmb_delete(&conn->scid_node);
+	HA_RWLOCK_WRLOCK(QUIC_LOCK, &qc->li->rx.cids_lock);
+	ebmb_delete(&qc->odcid_node);
+	ebmb_delete(&qc->scid_node);
 
-	HA_RWLOCK_WRUNLOCK(QUIC_LOCK, &conn->li->rx.cids_lock);
+	HA_RWLOCK_WRUNLOCK(QUIC_LOCK, &qc->li->rx.cids_lock);
 
 	for (i = 0; i < QUIC_TLS_ENC_LEVEL_MAX; i++)
-		quic_conn_enc_level_uninit(&conn->els[i]);
-	if (conn->timer_task)
-		task_destroy(conn->timer_task);
-	pool_free(pool_head_quic_conn_rxbuf, conn->rx.buf.area);
-	pool_free(pool_head_quic_conn, conn);
+		quic_conn_enc_level_uninit(&qc->els[i]);
+	if (qc->timer_task)
+		task_destroy(qc->timer_task);
+	pool_free(pool_head_quic_conn_rxbuf, qc->rx.buf.area);
+	pool_free(pool_head_quic_conn, qc);
 }
 
 void quic_close(struct connection *conn, void *xprt_ctx)