[master] d225748 ObjSnipe() is a better name

[Poul-Henning Kamp]

commit d2257489ecc12f4665e0a88108a9b2653984e6e5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Feb 3 09:55:08 2016 +0000

    ObjSnipe() is a better name

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index e738271..a1f8eba 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -857,7 +857,7 @@ void ObjSetState(const struct objcore *, enum boc_state_e next);
 void ObjWaitState(const struct objcore *, enum boc_state_e want);
 void ObjTrimStore(struct worker *, struct objcore *);
 void ObjTouch(struct worker *, struct objcore *, double now);
-int ObjKill(const struct worker *, struct objcore *);
+int ObjSnipe(const struct worker *, struct objcore *);
 unsigned ObjGetXID(struct worker *, struct objcore *);
 uint64_t ObjGetLen(struct worker *, struct objcore *);
 void ObjUpdateMeta(struct worker *, struct objcore *);
diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index 5b375d9..118743d 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -296,7 +296,7 @@ EXP_NukeOne(struct worker *wrk, struct lru *lru)
 
 		AZ(oc->lru_flags & OC_LRU_OFFLRU);
 
-		if (ObjKill(wrk, oc)) {
+		if (ObjSnipe(wrk, oc)) {
 			VSC_C_main->n_lru_nuked++; // XXX per lru ?
 			VTAILQ_REMOVE(&lru->lru_head, oc, lru_list);
 			oc->lru_flags |= OC_LRU_OFFLRU;
diff --git a/bin/varnishd/cache/cache_obj.c b/bin/varnishd/cache/cache_obj.c
index 9dda51b..d8cf967 100644
--- a/bin/varnishd/cache/cache_obj.c
+++ b/bin/varnishd/cache/cache_obj.c
@@ -370,13 +370,13 @@ ObjTouch(struct worker *wrk, struct objcore *oc, double now)
 }
 
 /*====================================================================
- * ObjKill()
+ * ObjSnipe()
  *
  * If objcore is idle, gain a ref and mark it dead.
  */
 
 int
-ObjKill(const struct worker *wrk, struct objcore *oc)
+ObjSnipe(const struct worker *wrk, struct objcore *oc)
 {
 	int retval = 0;