[master] 3ca7b1d5a Prefer struct vdp_ctx members over req members

Nils Goroll nils.goroll at uplex.de
Mon Dec 11 11:28:06 UTC 2023


commit 3ca7b1d5a2c6c82cbae14c8926cc10b6941b14cd
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Dec 11 12:18:20 2023 +0100

    Prefer struct vdp_ctx members over req members
    
    Struct vdp_ctx has wrk and vsl members, use these instead of req.

diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index d49b03c41..476c261f5 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -304,7 +304,7 @@ vdp_gunzip_init(VRT_CTX, struct vdp_ctx *vdc, void **priv, struct objcore *oc)
 	req = vdc->req;
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
-	vg = VGZ_NewGunzip(req->vsl, "U D -");
+	vg = VGZ_NewGunzip(vdc->vsl, "U D -");
 	AN(vg);
 	if (vgz_getmbuf(vg)) {
 		(void)VGZ_Destroy(&vg);
@@ -325,12 +325,12 @@ vdp_gunzip_init(VRT_CTX, struct vdp_ctx *vdc, void **priv, struct objcore *oc)
 	if (boc != NULL) {
 		CHECK_OBJ(boc, BOC_MAGIC);
 		bos = boc->state;
-		HSH_DerefBoc(req->wrk, oc);
+		HSH_DerefBoc(vdc->wrk, oc);
 		if (bos < BOS_FINISHED)
 			return (0); /* OA_GZIPBITS is not stable yet */
 	}
 
-	p = ObjGetAttr(req->wrk, oc, OA_GZIPBITS, &dl);
+	p = ObjGetAttr(vdc->wrk, oc, OA_GZIPBITS, &dl);
 	if (p != NULL && dl == 32) {
 		u = vbe64dec(p + 24);
 		if (u != 0)


More information about the varnish-commit mailing list