[master] 99f8560e4 Minor polish

Poul-Henning Kamp phk at FreeBSD.org
Mon Oct 4 08:11:07 UTC 2021


commit 99f8560e458f0dc793490018c02c5010de60920c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Oct 4 08:10:38 2021 +0000

    Minor polish

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index d868e0cac..20cf8a248 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -709,21 +709,28 @@ VCA_Shutdown(void)
 static VTAILQ_HEAD(,transport)	transports =
     VTAILQ_HEAD_INITIALIZER(transports);
 
+static uint16_t next_xport;
+
+static void
+XPORT_Register(struct transport *xp)
+{
+
+	CHECK_OBJ_NOTNULL(xp, TRANSPORT_MAGIC);
+	AZ(xp->number);
+
+	xp->number = ++next_xport;
+	VTAILQ_INSERT_TAIL(&transports, xp, list);
+}
+
 void
 XPORT_Init(void)
 {
-	uint16_t n;
-	struct transport *xp;
 
 	ASSERT_MGT();
 
-	VTAILQ_INSERT_TAIL(&transports, &PROXY_transport, list);
-	VTAILQ_INSERT_TAIL(&transports, &HTTP1_transport, list);
-	VTAILQ_INSERT_TAIL(&transports, &H2_transport, list);
-
-	n = 0;
-	VTAILQ_FOREACH(xp, &transports, list)
-		xp->number = ++n;
+	XPORT_Register(&PROXY_transport);
+	XPORT_Register(&HTTP1_transport);
+	XPORT_Register(&H2_transport);
 }
 
 const struct transport *


More information about the varnish-commit mailing list