[master] c310f04 Flexelinting

[Poul-Henning Kamp]

commit c310f04b64a9606afae6b1e85414033c45f19253
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Feb 27 09:55:31 2018 +0000

    Flexelinting

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index a8aadd1..9f564f1 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -732,7 +732,6 @@ extern const char H__Reason[];
 #define VXID(u) ((u) & VSL_IDENTMASK)
 uint32_t VXID_Get(struct worker *, uint32_t marker);
 extern volatile struct params * cache_param;
-extern volatile struct vre_limits *vparam_vre_limits;
 extern pthread_key_t witness_key;
 
 /* cache_lck.c */
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 043e968..f1e3915 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -52,8 +52,7 @@
 
 
 volatile struct params		*cache_param;
-// XXX generic solution?
-volatile struct vre_limits	*vparam_vre_limits;
+static volatile struct vre_limits	*vparam_vre_limits;
 
 /*--------------------------------------------------------------------
  * Per thread storage for the session currently being processed by
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index 64dad07..bffd461 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -141,7 +141,7 @@ MAC_reopen_sockets(void)
 /*--------------------------------------------------------------------*/
 
 static struct listen_sock *
-mk_listen_sock(struct listen_arg *la, const struct suckaddr *sa)
+mk_listen_sock(const struct listen_arg *la, const struct suckaddr *sa)
 {
 	struct listen_sock *ls;
 	int fail;