[master] 02a8578 Be consistent about upper/lower VTLA

Poul-Henning Kamp phk at FreeBSD.org
Tue Sep 26 06:34:07 UTC 2017


commit 02a8578dd29e7db83554f96e6af2c2f4b7260e06
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 26 06:32:06 2017 +0000

    Be consistent about upper/lower VTLA

diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index a548d60..3b909e4 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -273,14 +273,14 @@ vfp_esi_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
 	vfe->priv1 = NULL;
 }
 
-const struct vfp vfp_esi = {
+const struct vfp VFP_esi = {
 	.name = "esi",
 	.init = vfp_esi_init,
 	.pull = vfp_esi_pull,
 	.fini = vfp_esi_fini,
 };
 
-const struct vfp vfp_esi_gzip = {
+const struct vfp VFP_esi_gzip = {
 	.name = "esi_gzip",
 	.init = vfp_esi_gzip_init,
 	.pull = vfp_esi_gzip_pull,
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 01d1eac..65071b1 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -574,19 +574,19 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
 	assert(bo->do_gzip == 0 || bo->do_gunzip == 0);
 
 	if (bo->do_gunzip || (bo->is_gzip && bo->do_esi))
-		vbf_vfp_push(bo, &vfp_gunzip);
+		vbf_vfp_push(bo, &VFP_gunzip);
 
 	if (bo->htc->content_length != 0) {
 		if (bo->do_esi && bo->do_gzip) {
-			vbf_vfp_push(bo, &vfp_esi_gzip);
+			vbf_vfp_push(bo, &VFP_esi_gzip);
 		} else if (bo->do_esi && bo->is_gzip && !bo->do_gunzip) {
-			vbf_vfp_push(bo, &vfp_esi_gzip);
+			vbf_vfp_push(bo, &VFP_esi_gzip);
 		} else if (bo->do_esi) {
-			vbf_vfp_push(bo, &vfp_esi);
+			vbf_vfp_push(bo, &VFP_esi);
 		} else if (bo->do_gzip) {
-			vbf_vfp_push(bo, &vfp_gzip);
+			vbf_vfp_push(bo, &VFP_gzip);
 		} else if (bo->is_gzip && !bo->do_gunzip) {
-			vbf_vfp_push(bo, &vfp_testgunzip);
+			vbf_vfp_push(bo, &VFP_testgunzip);
 		}
 	}
 
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 0eb086d..029e2c4 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -664,7 +664,7 @@ vfp_gzip_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
 
 /*--------------------------------------------------------------------*/
 
-const struct vfp vfp_gunzip = {
+const struct vfp VFP_gunzip = {
 	.name = "gunzip",
 	.init = vfp_gzip_init,
 	.pull = vfp_gunzip_pull,
@@ -673,7 +673,7 @@ const struct vfp vfp_gunzip = {
 	.priv2 = VFP_GUNZIP,
 };
 
-const struct vfp vfp_gzip = {
+const struct vfp VFP_gzip = {
 	.name = "gzip",
 	.init = vfp_gzip_init,
 	.pull = vfp_gzip_pull,
@@ -682,7 +682,7 @@ const struct vfp vfp_gzip = {
 	.priv2 = VFP_GZIP,
 };
 
-const struct vfp vfp_testgunzip = {
+const struct vfp VFP_testgunzip = {
 	.name = "testgunzip",
 	.init = vfp_gzip_init,
 	.pull = vfp_testgunzip_pull,
diff --git a/bin/varnishd/cache/cache_priv.h b/bin/varnishd/cache/cache_priv.h
index 197510d..5faec37 100644
--- a/bin/varnishd/cache/cache_priv.h
+++ b/bin/varnishd/cache/cache_priv.h
@@ -93,11 +93,11 @@ void VFP_Setup(struct vfp_ctx *vc);
 int VFP_Open(struct vfp_ctx *bo);
 void VFP_Close(struct vfp_ctx *bo);
 
-extern const struct vfp vfp_gunzip;
-extern const struct vfp vfp_gzip;
-extern const struct vfp vfp_testgunzip;
-extern const struct vfp vfp_esi;
-extern const struct vfp vfp_esi_gzip;
+extern const struct vfp VFP_gunzip;
+extern const struct vfp VFP_gzip;
+extern const struct vfp VFP_testgunzip;
+extern const struct vfp VFP_esi;
+extern const struct vfp VFP_esi_gzip;
 
 /* cache_http.c */
 void HTTP_Init(void);


More information about the varnish-commit mailing list