[master] 36920626b Flexelinting

[Poul-Henning Kamp]

commit 36920626b0251c5ae283b258e8352b9eb4c800f4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Apr 18 07:04:25 2019 +0000

    Flexelinting

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 82af410e2..b3304bedb 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -696,7 +696,7 @@ vbf_stp_error(struct worker *wrk, struct busyobj *bo)
 	vtim_real now;
 	uint8_t *ptr;
 	struct vsb *synth_body;
-	struct objcore *stale = NULL;
+	struct objcore *stale;
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 0d22eeae8..2e7123205 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -751,8 +751,8 @@ HSH_Fail(struct objcore *oc)
  * Abandon a fetch we will not need
  */
 
-void
-HSH_Abandon(struct objcore *oc)
+static void
+hsh_abandon(struct objcore *oc)
 {
 	struct objhead *oh;
 
@@ -792,7 +792,7 @@ HSH_Cancel(struct worker *wrk, struct objcore *oc, struct boc *boc)
 		AN(oc->flags & OC_F_HFM);
 
 	if (boc != NULL) {
-		HSH_Abandon(oc);
+		hsh_abandon(oc);
 		ObjWaitState(oc, BOS_FINISHED);
 	}
 
diff --git a/bin/varnishd/cache/cache_objhead.h b/bin/varnishd/cache/cache_objhead.h
index c2755dce1..286859223 100644
--- a/bin/varnishd/cache/cache_objhead.h
+++ b/bin/varnishd/cache/cache_objhead.h
@@ -73,5 +73,4 @@ void HSH_AddString(struct req *, void *ctx, const char *str);
 unsigned HSH_Purge(struct worker *, struct objhead *, vtim_real ttl_now,
     vtim_dur ttl, vtim_dur grace, vtim_dur keep);
 struct objcore *HSH_Private(const struct worker *wrk);
-void HSH_Abandon(struct objcore *oc);
 void HSH_Cancel(struct worker *, struct objcore *, struct boc *);
diff --git a/bin/varnishd/flint.lnt b/bin/varnishd/flint.lnt
index 5a1942528..20166d91b 100644
--- a/bin/varnishd/flint.lnt
+++ b/bin/varnishd/flint.lnt
@@ -1,5 +1,14 @@
 // -w4
 
+///////////////////////////////////////////////////////////////////////
+// deprecated
+
+-esym(765, WS_Reserve)
+-esym(714, WS_Reserve)
+-esym(759, WS_Reserve)
+
+///////////////////////////////////////////////////////////////////////
+
 -printf(3, VSL)
 -printf(2, http_PrintfHeader)
 -printf(2, VSB_printf)