[master] 6ad72f004 flexlint: HSH_DerefObjCoreUnlock is only used in cache_hash.c

Walid Boudebouda walid.boudebouda at gmail.com
Mon Sep 1 09:04:05 UTC 2025


commit 6ad72f004c6339dea07ab97d53db3315636b6bdf
Author: Walid Boudebouda <walid.boudebouda at gmail.com>
Date:   Mon Sep 1 11:01:28 2025 +0200

    flexlint: HSH_DerefObjCoreUnlock is only used in cache_hash.c

diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 1530d0e81..fde0c87d2 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -82,6 +82,7 @@ static void hsh_rush2(struct worker *, struct rush *);
 static int hsh_deref_objhead(struct worker *wrk, struct objhead **poh);
 static int hsh_deref_objhead_unlock(struct worker *wrk, struct objhead **poh,
     struct objcore *oc);
+static int hsh_deref_objcore_unlock(struct worker *, struct objcore **);
 
 /*---------------------------------------------------------------------*/
 
@@ -1024,7 +1025,7 @@ HSH_Withdraw(struct worker *wrk, struct objcore **ocp)
 	oc->flags &= ~OC_F_BUSY;
 	oc->flags |= OC_F_WITHDRAWN;
 	hsh_rush1(wrk, oc, &rush); /* grabs up to 1 oc ref */
-	assert(HSH_DerefObjCoreUnlock(wrk, &oc) <= 1);
+	assert(hsh_deref_objcore_unlock(wrk, &oc) <= 1);
 
 	hsh_rush2(wrk, &rush);
 }
@@ -1227,11 +1228,11 @@ HSH_DerefObjCore(struct worker *wrk, struct objcore **ocp)
 	CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
 
 	Lck_Lock(&oh->mtx);
-	return (HSH_DerefObjCoreUnlock(wrk, &oc));
+	return (hsh_deref_objcore_unlock(wrk, &oc));
 }
 
-int
-HSH_DerefObjCoreUnlock(struct worker *wrk, struct objcore **ocp)
+static int
+hsh_deref_objcore_unlock(struct worker *wrk, struct objcore **ocp)
 {
 	struct objcore *oc;
 	struct objhead *oh;
diff --git a/bin/varnishd/cache/cache_objhead.h b/bin/varnishd/cache/cache_objhead.h
index 162aaeb7f..2c617e88b 100644
--- a/bin/varnishd/cache/cache_objhead.h
+++ b/bin/varnishd/cache/cache_objhead.h
@@ -78,7 +78,6 @@ struct boc *HSH_RefBoc(const struct objcore *);
 void HSH_DerefBoc(struct worker *wrk, struct objcore *);
 void HSH_DeleteObjHead(const struct worker *, struct objhead *);
 int HSH_DerefObjCore(struct worker *, struct objcore **);
-int HSH_DerefObjCoreUnlock(struct worker *, struct objcore **);
 enum lookup_e HSH_Lookup(struct req *, struct objcore **, struct objcore **);
 void HSH_Ref(struct objcore *o);
 void HSH_AddString(struct req *, void *ctx, const char *str);


More information about the varnish-commit mailing list