upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-07-16 04:13:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CLEANUP: traces: get rid of a few rare empty args in TRACE calls

Browse source 
The TRACE macro allows to leave empty args and automatically turns them
into zeroes. However it also limits how we can remap the macro, because
functions do not accept this for example. There are very few places all
over the code where ',,' exists in TRACE calls, so let's explicitly add
the 0 there. It could even make some editors' syntax highlighting happier.
This commit is contained in:
Willy Tarreau 2026-07-01 14:31:55 +02:00
parent 4fe06d8c83
commit 50c00ee235
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mux_h2.c
View file

@ -3560,7 +3560,7 @@ static struct h2s *h2c_frt_handle_headers(struct h2c *h2c, struct h2s *h2s)
/* The stream exists/existed, this must be a trailers frame */
if (h2s->st != H2_SS_CLOSED) {
if (!h2s_rxbuf_tail(h2s) && !h2s_get_rxbuf(h2s)) {
TRACE_USER("Not allowed to get an extra buffer for H2 request trailers", H2_EV_RX_FRAME|H2_EV_RX_HDR|H2_EV_STRM_NEW|H2_EV_STRM_END, h2c->conn, );
TRACE_USER("Not allowed to get an extra buffer for H2 request trailers", H2_EV_RX_FRAME|H2_EV_RX_HDR|H2_EV_STRM_NEW|H2_EV_STRM_END, h2c->conn, 0);
h2c->flags |= H2_CF_DEM_RXBUF;
goto out;
}
@ -3794,7 +3794,7 @@ static struct h2s *h2c_bck_handle_headers(struct h2c *h2c, struct h2s *h2s)
}
if (!h2s_rxbuf_tail(h2s) && !h2s_get_rxbuf(h2s)) {
TRACE_USER("Not allowed to get an extra buffer for H2 response HEADERS", H2_EV_RX_FRAME|H2_EV_RX_HDR|H2_EV_STRM_NEW|H2_EV_STRM_END, h2c->conn, );
TRACE_USER("Not allowed to get an extra buffer for H2 response HEADERS", H2_EV_RX_FRAME|H2_EV_RX_HDR|H2_EV_STRM_NEW|H2_EV_STRM_END, h2c->conn, 0);
h2c->flags |= H2_CF_DEM_RXBUF;
goto fail;
}

4
src/quic_frame.c
View file

@ -292,7 +292,7 @@ static int quic_build_ack_frame(unsigned char **pos, const unsigned char *end,
ar = eb64_last(&ack_frm->arngs->root);
ar_node = eb64_entry(ar, struct quic_arng_node, first);
TRACE_PROTO("TX ack range", QUIC_EV_CONN_PRSAFRM,
qc,, &ar_node->last, &ar_node->first.key);
qc, 0, &ar_node->last, &ar_node->first.key);
if (!quic_enc_int(pos, end, ar_node->last) ||
!quic_enc_int(pos, end, ack_frm->ack_delay) ||
!quic_enc_int(pos, end, ack_frm->arngs->sz - 1) ||
@ -301,7 +301,7 @@ static int quic_build_ack_frame(unsigned char **pos, const unsigned char *end,
while ((prev_ar = eb64_prev(ar))) {
prev_ar_node = eb64_entry(prev_ar, struct quic_arng_node, first);
TRACE_PROTO("TX ack range", QUIC_EV_CONN_PRSAFRM, qc,,
TRACE_PROTO("TX ack range", QUIC_EV_CONN_PRSAFRM, qc, 0,
&prev_ar_node->last, &prev_ar_node->first.key);
if (!quic_enc_int(pos, end, ar_node->first.key - prev_ar_node->last - 2) ||
!quic_enc_int(pos, end, prev_ar_node->last - prev_ar_node->first.key))

2
src/quic_loss.c
View file

@ -44,7 +44,7 @@ void quic_loss_srtt_update(struct quic_loss *ql,
ql->srtt = (7 * ql->srtt + rtt) / 8;
}
TRACE_PROTO("TX loss srtt update", QUIC_EV_CONN_RTTUPDT, qc,,, ql);
TRACE_PROTO("TX loss srtt update", QUIC_EV_CONN_RTTUPDT, qc, 0, 0, ql);
TRACE_LEAVE(QUIC_EV_CONN_RTTUPDT, qc);
}