[master] 52320df6d cocci: Apply take_obj_notnull.cocci for casts

[Dridi Boukelmoune]

commit 52320df6d3f5a9bc8ab1b0fdbc75ff700bdfcb0a
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Jul 10 09:57:26 2023 +0200

    cocci: Apply take_obj_notnull.cocci for casts
    
    Avoiding conflicts with #3954.

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index c3b7cbb7f..02af9fd27 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -796,8 +796,7 @@ ved_gzgz_fini(struct vdp_ctx *vdc, void **priv)
 	struct ved_foo *foo;
 
 	(void)vdc;
-	CAST_OBJ_NOTNULL(foo, *priv, VED_FOO_MAGIC);
-	*priv = NULL;
+	TAKE_OBJ_NOTNULL(foo, priv, VED_FOO_MAGIC);
 
 	/* XXX
 	 * this works due to the esi layering, a VDP pushing bytes from _fini
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index d97985734..c1434dc62 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -693,8 +693,7 @@ vfp_gzip_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
 	CHECK_OBJ_NOTNULL(vfe, VFP_ENTRY_MAGIC);
 
 	if (vfe->priv1 != NULL) {
-		CAST_OBJ_NOTNULL(vg, vfe->priv1, VGZ_MAGIC);
-		vfe->priv1 = NULL;
+		TAKE_OBJ_NOTNULL(vg, &vfe->priv1, VGZ_MAGIC);
 		(void)VGZ_Destroy(&vg);
 	}
 }
diff --git a/bin/varnishd/hash/hash_critbit.c b/bin/varnishd/hash/hash_critbit.c
index 2424947e3..dbf10fec1 100644
--- a/bin/varnishd/hash/hash_critbit.c
+++ b/bin/varnishd/hash/hash_critbit.c
@@ -242,8 +242,7 @@ hcb_insert(const struct worker *wrk, struct hcb_root *root,
 
 	/* Insert */
 
-	CAST_OBJ_NOTNULL(y2, wrk->wpriv->nhashpriv, HCB_Y_MAGIC);
-	wrk->wpriv->nhashpriv = NULL;
+	TAKE_OBJ_NOTNULL(y2, &wrk->wpriv->nhashpriv, HCB_Y_MAGIC);
 	(void)hcb_crit_bit(digest, oh2, y2);
 	s2 = (digest[y2->ptr] & y2->bitmask) != 0;
 	assert(s2 < 2);