[master] 86300e2 Remove some debugging, polish

[Poul-Henning Kamp]

commit 86300e248911e50b174ad8dcf4a60890669d4e16
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed May 6 20:59:33 2015 +0000

    Remove some debugging, polish

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 54422bc..2041a74 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -985,7 +985,7 @@ size_t V1L_Write(const struct worker *w, const void *ptr, ssize_t len);
 task_func_t VPX_Proto_Sess;
 
 /* cache_range.c [VRG] */
-void VRG_dorange(struct req *req, struct busyobj *bo, const char *r);
+void VRG_dorange(struct req *req, const struct busyobj *bo, const char *r);
 
 /* cache_req.c */
 struct req *Req_New(const struct worker *, struct sess *);
diff --git a/bin/varnishd/cache/cache_range.c b/bin/varnishd/cache/cache_range.c
index 3bb4753..fcff78a 100644
--- a/bin/varnishd/cache/cache_range.c
+++ b/bin/varnishd/cache/cache_range.c
@@ -172,7 +172,7 @@ vrg_dorange(struct req *req, ssize_t len, const char *r)
 }
 
 void
-VRG_dorange(struct req *req, struct busyobj *bo, const char *r)
+VRG_dorange(struct req *req, const struct busyobj *bo, const char *r)
 {
 	ssize_t len;
 	int i;
@@ -182,14 +182,9 @@ VRG_dorange(struct req *req, struct busyobj *bo, const char *r)
 	assert(http_IsStatus(req->resp, 200));
 
 	/* We must snapshot the length if we're streaming from the backend */
-	if (bo != NULL) {
+	if (bo != NULL)
 		len = http_GetContentLength(bo->beresp);
-VSLb(req->vsl, SLT_Debug, "UUU 1 %jd", (intmax_t)len);
-#if 0
-		if (len < 0)
-			len = VBO_waitlen(req->wrk, bo, -1);
-#endif
-	} else
+	else
 		len = ObjGetLen(req->wrk, req->objcore);
 
 	i = vrg_dorange(req, len, r);