commit e7ff2b265a40d31d93b7258171738d36f9f85a9c
author Frédéric Lécaille <flecaille@haproxy.com> Wed Dec 22 17:40:38 2021 +0100
committer Frédéric Lécaille <flecaille@haproxy.com> Wed Dec 22 20:43:22 2021 +0100
tree 8ae0f44e17fa1aba8e802da071279a8b216ae8f4
parent 10250b2e930e8f92e9e5211a2e35b6d901192d25

MINOR: quic: xprt traces fixes

Empty parameters are permitted with TRACE_*() macros. If removed, must
be replaced by NULL.

src/xprt_quic.c

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 7967802..be71f26 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -1513,7 +1513,7 @@
 		pkt = eb64_entry(&node->node, struct quic_tx_packet, pn_node);
 		*pkt_flags |= pkt->flags;
 		LIST_INSERT(newly_acked_pkts, &pkt->list);
-		TRACE_PROTO("Removing packet #", QUIC_EV_CONN_PRSAFRM, ctx->qc, &pkt->pn_node.key);
+		TRACE_PROTO("Removing packet #", QUIC_EV_CONN_PRSAFRM, ctx->qc, NULL, &pkt->pn_node.key);
 		list_for_each_entry_safe(frm, frmbak, &pkt->frms, list)
 			qc_treat_acked_tx_frm(frm, ctx);
 		node = eb64_prev(node);
@@ -1724,13 +1724,13 @@
 
 	if (ack->largest_ack > qel->pktns->tx.next_pn) {
 		TRACE_DEVEL("ACK for not sent packet", QUIC_EV_CONN_PRSAFRM,
-		            ctx->qc, &ack->largest_ack);
+		            ctx->qc, NULL, &ack->largest_ack);
 		goto err;
 	}
 
 	if (ack->first_ack_range > ack->largest_ack) {
 		TRACE_DEVEL("too big first ACK range", QUIC_EV_CONN_PRSAFRM,
-		            ctx->qc, &ack->first_ack_range);
+		            ctx->qc, NULL, &ack->first_ack_range);
 		goto err;
 	}
 
@@ -1754,7 +1754,7 @@
 	}
 
 	TRACE_PROTO("ack range", QUIC_EV_CONN_PRSAFRM,
-	            ctx->qc, &largest, &smallest);
+	            ctx->qc, NULL, &largest, &smallest);
 	do {
 		uint64_t gap, ack_range;
 
@@ -1768,7 +1768,7 @@
 
 		if (smallest < gap + 2) {
 			TRACE_DEVEL("wrong gap value", QUIC_EV_CONN_PRSAFRM,
-			            ctx->qc, &gap, &smallest);
+			            ctx->qc, NULL, &gap, &smallest);
 			goto err;
 		}
 
@@ -1778,7 +1778,7 @@
 
 		if (largest < ack_range) {
 			TRACE_DEVEL("wrong ack range value", QUIC_EV_CONN_PRSAFRM,
-			            ctx->qc, &largest, &ack_range);
+			            ctx->qc, NULL, &largest, &ack_range);
 			goto err;
 		}
 
@@ -1788,7 +1788,7 @@
 		smallest = largest - ack_range;
 
 		TRACE_PROTO("ack range", QUIC_EV_CONN_PRSAFRM,
-		            ctx->qc, &largest, &smallest);
+		            ctx->qc, NULL, &largest, &smallest);
 	} while (1);
 
 	/* Flag this packet number space as having received an ACK. */
@@ -1870,7 +1870,7 @@
 
 	el->rx.crypto.offset += len;
 	TRACE_PROTO("in order CRYPTO data",
-	            QUIC_EV_CONN_SSLDATA, qc, cf, ctx->ssl);
+	            QUIC_EV_CONN_SSLDATA, qc, NULL, cf, ctx->ssl);
 
 	state = HA_ATOMIC_LOAD(&qc->state);
 	if (state < QUIC_HS_ST_COMPLETE) {