[master] 076e077 Remove unused #includes and an unused function argument

[Poul-Henning Kamp]

commit 076e0770c521661082be1f52a5101d82512eb933
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Feb 25 13:30:01 2015 +0000

    Remove unused #includes and an unused function argument

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index c2cf666..1d97950 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -279,7 +279,7 @@ VRT_init_vbe(VRT_CTX, struct director **dp, const struct vrt_backend *vrt)
 	AZ(*dp);
 	CHECK_OBJ_NOTNULL(vrt, VRT_BACKEND_MAGIC);
 
-	be = VBE_AddBackend(NULL, vrt);
+	be = VBE_AddBackend(vrt);
 	AN(be);
 	ALLOC_OBJ(d, DIRECTOR_MAGIC);
 	XXXAN(d);
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index c7370a9..f07cad0 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -109,7 +109,7 @@ void VBE_DropRefVcl(struct backend *);
 void VBE_DropRefLocked(struct backend *b, const struct acct_bereq *);
 unsigned VBE_Healthy(const struct backend *b, double *changed);
 void VBE_InitCfg(void);
-struct backend *VBE_AddBackend(struct cli *cli, const struct vrt_backend *vb);
+struct backend *VBE_AddBackend(const struct vrt_backend *vb);
 void VBE_Poll(void);
 
 /* cache_backend_poll.c */
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 6f6e2e1..79968f9 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -152,15 +152,14 @@ VBE_DropRefConn(struct backend *b, const struct acct_bereq *acct_bereq)
  */
 
 struct backend *
-VBE_AddBackend(struct cli *cli, const struct vrt_backend *vb)
+VBE_AddBackend(const struct vrt_backend *vb)
 {
 	struct backend *b;
 	char buf[128];
 
+	ASSERT_CLI();
 	AN(vb->vcl_name);
 	assert(vb->ipv4_suckaddr != NULL || vb->ipv6_suckaddr != NULL);
-	(void)cli;
-	ASSERT_CLI();
 
 	/* Run through the list and see if we already have this backend */
 	VTAILQ_FOREACH(b, &backends, list) {
diff --git a/bin/varnishd/cache/cache_fetch_proc.c b/bin/varnishd/cache/cache_fetch_proc.c
index 8030fe4..8e5be9f 100644
--- a/bin/varnishd/cache/cache_fetch_proc.c
+++ b/bin/varnishd/cache/cache_fetch_proc.c
@@ -39,7 +39,6 @@
 
 #include "hash/hash_slinger.h"
 
-#include "cache_backend.h"
 #include "vcli_priv.h"
 
 static unsigned fetchfrag;
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 8554658..d48f776 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -35,8 +35,6 @@
 #include "cache.h"
 #include "common/heritage.h"
 
-#include "cache_backend.h"	// For wrk->vbc
-
 #include "vmb.h"
 #include "vtim.h"
 
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index d152cb1..2522b81 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "cache_backend.h"
 
 #include "vcl.h"
 #include "vrt.h"
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index 7e3215f..634bfe9 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -37,7 +37,6 @@
 
 #include "hash/hash_slinger.h"
 
-#include "cache/cache_backend.h"
 #include "cache/cache_director.h"
 #include "vcli_priv.h"
 #include "vtcp.h"