From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Mon, 24 Apr 2023 13:44:18 +0000 (+0200)
Subject: CLEANUP: quic: Rename <buf> variable into qc_parse_hd_form()
X-Git-Tag: v2.8-dev9~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb426aa5f13d122fe284486458aa973908404e2b;p=thirdparty%2Fhaproxy.git

CLEANUP: quic: Rename <buf> variable into qc_parse_hd_form()

There is no struct buffer variable manipulated by this function.

Should be backported to 2.7.
---

diff --git a/src/quic_conn.c b/src/quic_conn.c
index f2317f180d..d768022385 100644
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -6131,7 +6131,7 @@ static inline const struct quic_version *qc_supported_version(uint32_t version)
 	return NULL;
 }
 
-/* Parse a QUIC packet header starting at <buf> without exceeding <end>.
+/* Parse a QUIC packet header starting at <pos> postion without exceeding <end>.
  * Version and type are stored in <pkt> packet instance. Type is set to unknown
  * on two occasions : for unsupported version, in this case version field is
  * set to NULL; for Version Negotiation packet with version number set to 0.
@@ -6139,23 +6139,23 @@ static inline const struct quic_version *qc_supported_version(uint32_t version)
  * Returns 1 on success else 0.
  */
 int qc_parse_hd_form(struct quic_rx_packet *pkt,
-                     unsigned char **buf, const unsigned char *end)
+                     unsigned char **pos, const unsigned char *end)
 {
 	uint32_t version;
 	int ret = 0;
-	const unsigned char byte0 = **buf;
+	const unsigned char byte0 = **pos;
 
 	TRACE_ENTER(QUIC_EV_CONN_RXPKT);
 	pkt->version = NULL;
 	pkt->type = QUIC_PACKET_TYPE_UNKNOWN;
 
-	(*buf)++;
+	(*pos)++;
 	if (byte0 & QUIC_PACKET_LONG_HEADER_BIT) {
 		unsigned char type =
 			(byte0 >> QUIC_PACKET_TYPE_SHIFT) & QUIC_PACKET_TYPE_BITMASK;
 
 		/* Version */
-		if (!quic_read_uint32(&version, (const unsigned char **)buf, end)) {
+		if (!quic_read_uint32(&version, (const unsigned char **)pos, end)) {
 			TRACE_ERROR("could not read the packet version", QUIC_EV_CONN_RXPKT);
 			goto out;
 		}