[master] c108e6031 Re-apply tools/coccinelle/check_obj.cocci

[Nils Goroll]

commit c108e603141bd8270090a91fec880d1a2805d56c
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Feb 9 16:51:27 2021 +0100

    Re-apply tools/coccinelle/check_obj.cocci
    
    After edb0ca9863431dc8ccc6c37e779c179fc29f53cf, the ladybug understands
    our code better.

diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index abd5d5daa..b6d69bd61 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -191,7 +191,7 @@ mpl_guard(void *priv)
 		if (mi == NULL) {
 			mi = VTAILQ_FIRST(&mpl->surplus);
 			if (mi != NULL) {
-				CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+				CHECK_OBJ(mi, MEMITEM_MAGIC);
 				VTAILQ_REMOVE(&mpl->surplus, mi, list);
 				mpl_slp = .01;	// random
 			}
diff --git a/bin/varnishd/cache/cache_vrt_priv.c b/bin/varnishd/cache/cache_vrt_priv.c
index 3aa166514..02ba46bdd 100644
--- a/bin/varnishd/cache/cache_vrt_priv.c
+++ b/bin/varnishd/cache/cache_vrt_priv.c
@@ -166,11 +166,11 @@ vrt_priv_task_context(VRT_CTX)
 	    ctx->method == VCL_MET_PIPE || ctx->method == 0);
 
 	if (ctx->req) {
-		CHECK_OBJ_NOTNULL(ctx->req, REQ_MAGIC);
+		CHECK_OBJ(ctx->req, REQ_MAGIC);
 		return (ctx->req->privs);
 	}
 	if (ctx->bo) {
-		CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
+		CHECK_OBJ(ctx->bo, BUSYOBJ_MAGIC);
 		return (ctx->bo->privs);
 	}
 	ASSERT_CLI();
diff --git a/bin/varnishd/cache/cache_vrt_vcl.c b/bin/varnishd/cache/cache_vrt_vcl.c
index cda736eaa..b7ecdd7ff 100644
--- a/bin/varnishd/cache/cache_vrt_vcl.c
+++ b/bin/varnishd/cache/cache_vrt_vcl.c
@@ -457,7 +457,7 @@ vcl_call_method(struct worker *wrk, struct req *req, struct busyobj *bo,
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	INIT_OBJ(&ctx, VRT_CTX_MAGIC);
 	if (bo != NULL) {
-		CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+		CHECK_OBJ(bo, BUSYOBJ_MAGIC);
 		CHECK_OBJ_NOTNULL(bo->vcl, VCL_MAGIC);
 		VCL_Bo2Ctx(&ctx, bo);
 	}
diff --git a/vmod/vmod_std.c b/vmod/vmod_std.c
index 1cf60162c..bb24e04ce 100644
--- a/vmod/vmod_std.c
+++ b/vmod/vmod_std.c
@@ -224,7 +224,7 @@ vmod_timestamp(VRT_CTX, VCL_STRING label)
 		VSLb_ts_busyobj(ctx->bo, label, VTIM_real());
 	} else if (ctx->req != NULL) {
 		/* Called from request vcl methods */
-		CHECK_OBJ_NOTNULL(ctx->req, REQ_MAGIC);
+		CHECK_OBJ(ctx->req, REQ_MAGIC);
 		VSLb_ts_req(ctx->req, label, VTIM_real());
 	}
 }