[6.0] b40aa2cea disambiguate VTLA variable names - vcp is now connection pooling

Nils Goroll nils.goroll at uplex.de
Thu Aug 16 08:52:31 UTC 2018


commit b40aa2cea0ec1100abc58ae9555db3e35922d708
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Mar 31 15:41:37 2018 +0200

    disambiguate VTLA variable names - vcp is now connection pooling

diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 5ac0a0065..6001d323b 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -686,12 +686,12 @@ VRT_VSM_Cluster_New(VRT_CTX, size_t sz)
 }
 
 void v_matchproto_()
-VRT_VSM_Cluster_Destroy(VRT_CTX, struct vsmw_cluster **vcp)
+VRT_VSM_Cluster_Destroy(VRT_CTX, struct vsmw_cluster **vsmcp)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	AN(vcp);
-	VSMW_DestroyCluster(heritage.proc_vsmw, vcp);
+	AN(vsmcp);
+	VSMW_DestroyCluster(heritage.proc_vsmw, vsmcp);
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index 8501cc414..0aa5477e6 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -275,15 +275,15 @@ VSMW_NewCluster(struct vsmw *vsmw, size_t len, const char *pfx)
 }
 
 void
-VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vcp)
+VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
 {
 	struct vsmw_cluster *vc;
 
 	vsmw_lock();
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
-	AN(vcp);
-	vc = *vcp;
-	*vcp = NULL;
+	AN(vsmcp);
+	vc = *vsmcp;
+	*vsmcp = NULL;
 	CHECK_OBJ_NOTNULL(vc, VSMW_CLUSTER_MAGIC);
 
 	if (vc->cseg != NULL) {


More information about the varnish-commit mailing list