[master] c1f35e2b1 Tidy up

[Federico G. Schwindt]

commit c1f35e2b1e6efcb6a4fc82e91ba23423e1c6bc66
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Dec 21 16:46:14 2018 +0000

    Tidy up

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 9e0f5cb4d..7bec80cb9 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -498,11 +498,10 @@ vbf_stp_fetchbody(struct worker *wrk, struct busyobj *bo)
 	ObjTrimStore(wrk, vfc->oc);
 	return (F_STP_FETCHEND);
 }
+
 static enum fetch_step
 vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
 {
-	const char *p;
-
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
 	CHECK_OBJ_NOTNULL(bo->fetch_objcore, OBJCORE_MAGIC);
@@ -553,8 +552,8 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
 
 	if (!(bo->fetch_objcore->flags & OC_F_HFM) &&
 	    http_IsStatus(bo->beresp, 200) && (
-	      http_GetHdr(bo->beresp, H_Last_Modified, &p) ||
-	      http_GetHdr(bo->beresp, H_ETag, &p)))
+	      http_GetHdr(bo->beresp, H_Last_Modified, NULL) ||
+	      http_GetHdr(bo->beresp, H_ETag, NULL)))
 		ObjSetFlag(bo->wrk, bo->fetch_objcore, OF_IMSCAND, 1);
 
 	assert(bo->fetch_objcore->boc->refcount >= 1);