[master] d3c50d043 rename vcl_get() -> VCL_Update()

Nils Goroll nils.goroll at uplex.de
Mon Jan 27 15:21:06 UTC 2020


commit d3c50d0435cb0e58794bf9406c31ce728ac447fb
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jan 27 16:11:37 2020 +0100

    rename vcl_get() -> VCL_Update()
    
    note: no change to vrt.h, this is a private interface between vcl and
    vrt_vcl/vpi.

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index fa653c636..8c0686597 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -257,7 +257,7 @@ VCL_Panic(struct vsb *vsb, const char *nm, const struct vcl *vcl)
 /*--------------------------------------------------------------------*/
 
 void
-vcl_get(struct vcl **vcc, struct vcl *vcl)
+VCL_Update(struct vcl **vcc, struct vcl *vcl)
 {
 	struct vcl *old;
 
diff --git a/bin/varnishd/cache/cache_vcl.h b/bin/varnishd/cache/cache_vcl.h
index 1864367ce..885e918a8 100644
--- a/bin/varnishd/cache/cache_vcl.h
+++ b/bin/varnishd/cache/cache_vcl.h
@@ -70,7 +70,7 @@ struct vclref {
 extern struct lock		vcl_mtx;
 extern struct vcl		*vcl_active; /* protected by vcl_mtx */
 struct vcl *vcl_find(const char *);
-void vcl_get(struct vcl **, struct vcl *);
+void VCL_Update(struct vcl **, struct vcl *);
 
 struct vcltemp {
 	const char * const	name;
diff --git a/bin/varnishd/cache/cache_vpi.c b/bin/varnishd/cache/cache_vpi.c
index fd168fc18..e02867521 100644
--- a/bin/varnishd/cache/cache_vpi.c
+++ b/bin/varnishd/cache/cache_vpi.c
@@ -109,7 +109,7 @@ VPI_vcl_select(VRT_CTX, VCL_VCL vcl)
 		req->top->vcl0 = req->vcl;
 		req->vcl = NULL;
 	}
-	vcl_get(&req->vcl, vcl);
+	VCL_Update(&req->vcl, vcl);
 	VSLb(ctx->req->vsl, SLT_VCL_use, "%s via %s",
 	    req->vcl->loaded_name, vcl->loaded_name);
 }
diff --git a/bin/varnishd/cache/cache_vrt_vcl.c b/bin/varnishd/cache/cache_vrt_vcl.c
index d02f9bddc..2d7b39a36 100644
--- a/bin/varnishd/cache/cache_vrt_vcl.c
+++ b/bin/varnishd/cache/cache_vrt_vcl.c
@@ -85,7 +85,7 @@ VCL_Refresh(struct vcl **vcc)
 	if (*vcc == vcl_active)
 		return;
 
-	vcl_get(vcc, NULL);
+	VCL_Update(vcc, NULL);
 }
 
 void


More information about the varnish-commit mailing list