[6.0] fa716ba28 Rename HSH_DerefObjhead() to hsh_deref_objhead()

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri Feb 8 13:13:10 UTC 2019


commit fa716ba280f59d6b9b2d0543b59eefcbfab637d4
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Dec 4 10:55:19 2018 +0100

    Rename HSH_DerefObjhead() to hsh_deref_objhead()
    
    Make this function lower case for consistency.

diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 9468504d5..80a8a6f92 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -76,7 +76,7 @@ static struct objhead *private_oh;
 static void hsh_rush1(const struct worker *, struct objhead *,
     struct rush *, int);
 static void hsh_rush2(struct worker *, struct rush *);
-static int HSH_DerefObjHead(struct worker *wrk, struct objhead **poh);
+static int hsh_deref_objhead(struct worker *wrk, struct objhead **poh);
 
 /*---------------------------------------------------------------------*/
 
@@ -461,7 +461,7 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
 			Lck_Unlock(&oh->mtx);
 			*ocp = oc;
 			if (*bocp == NULL)
-				assert(HSH_DerefObjHead(wrk, &oh));
+				assert(hsh_deref_objhead(wrk, &oh));
 
 			switch (retval) {
 			case HSH_HITPASS:
@@ -541,7 +541,7 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
 		Lck_Unlock(&oh->mtx);
 		*ocp = exp_oc;
 
-		assert(HSH_DerefObjHead(wrk, &oh));
+		assert(hsh_deref_objhead(wrk, &oh));
 		if (exp_oc->hits < LONG_MAX)
 			exp_oc->hits++;
 		return (HSH_GRACE);
@@ -974,12 +974,12 @@ HSH_DerefObjCore(struct worker *wrk, struct objcore **ocp, int rushmax)
 
 	/* Drop our ref on the objhead */
 	assert(oh->refcnt > 0);
-	(void)HSH_DerefObjHead(wrk, &oh);
+	(void)hsh_deref_objhead(wrk, &oh);
 	return (0);
 }
 
 static int
-HSH_DerefObjHead(struct worker *wrk, struct objhead **poh)
+hsh_deref_objhead(struct worker *wrk, struct objhead **poh)
 {
 	struct objhead *oh;
 	struct rush rush;


More information about the varnish-commit mailing list