[master] aa3f6787b Flexelint polish

Nils Goroll nils.goroll at uplex.de
Fri Mar 1 16:26:05 UTC 2024


commit aa3f6787b8e5cac4d014d3c0548b9179d8357597
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Mar 1 17:16:49 2024 +0100

    Flexelint polish
    
    Ref 2d494dc7c6b3adb53c7679ba13929ffa530aa8b5
        bb3d027bf6647185be548050243e1cb9d36741a7

diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
index 035cf526f..b0af89c74 100644
--- a/bin/varnishd/cache/cache_deliver_proc.c
+++ b/bin/varnishd/cache/cache_deliver_proc.c
@@ -64,7 +64,7 @@ VDP_Panic(struct vsb *vsb, const struct vdp_ctx *vdc)
  * to avoid leaks in VDPs
  */
 void
-VDP_Fini(struct vdp_ctx *vdc)
+VDP_Fini(const struct vdp_ctx *vdc)
 {
 	assert(VTAILQ_EMPTY(&vdc->vdp));
 }
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index dd921c0f9..f9a97b085 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -943,5 +943,5 @@ ved_deliver(struct req *req, struct boc *boc, int wantbody)
 	if (i && req->doclose == SC_NULL)
 		req->doclose = SC_REM_CLOSE;
 
-	ved_close(req, boc, i && !ecx->incl_cont);
+	ved_close(req, boc, i && !ecx->incl_cont ? 1 : 0);
 }
diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index 0ce03cf0a..019b426dc 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -189,7 +189,7 @@ void VDI_Event(const struct director *d, enum vcl_event_e ev);
 void VDI_Init(void);
 
 /* cache_deliver_proc.c */
-void VDP_Fini(struct vdp_ctx *vdc);
+void VDP_Fini(const struct vdp_ctx *vdc);
 void VDP_Init(struct vdp_ctx *vdc, struct worker *wrk, struct vsl_log *vsl,
     struct req *req);
 uint64_t VDP_Close(struct vdp_ctx *, struct objcore *, struct boc *);


More information about the varnish-commit mailing list