[master] 06874f1 Simplify VCC setup a little bit.

[Poul-Henning Kamp]

commit 06874f1d8fd9c2e89bf9625f685c35b5194112ea
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed May 18 07:23:55 2016 +0000

    Simplify VCC setup a little bit.

diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index d174206..e230ee6 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -167,7 +167,6 @@ void STV_Config_Transient(void);
 /* mgt_vcc.c */
 char *mgt_VccCompile(struct cli *, const char *vclname, const char *vclsrc,
     const char *vclsrcfile, int C_flag);
-void mgt_vcc_init(void);
 
 void mgt_vcl_init(void);
 void mgt_vcc_startup(struct cli *, const char *b_arg, const char *f_arg,
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 36005a3..d696839 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -747,7 +747,6 @@ main(int argc, char * const *argv)
 		    P_arg, strerror(errno));
 	VJ_master(JAIL_MASTER_LOW);
 
-	mgt_vcc_init();
 	mgt_vcl_init();
 
 	if (b_arg != NULL || f_arg != NULL) {
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index 9a094fb..8847c03 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -65,7 +65,6 @@ unsigned mgt_vcc_err_unref;
 unsigned mgt_vcc_allow_inline_c;
 unsigned mgt_vcc_unsafe_path;
 
-static struct vcp *vcp;
 
 #define VGC_SRC		"vgc.c"
 #define VGC_LIB		"vgc.so"
@@ -87,6 +86,7 @@ run_vcc(void *priv)
 	struct vsb *sb;
 	struct vcc_priv *vp;
 	int fd, i, l;
+	struct vcp *vcp;
 
 	VJ_subproc(JAIL_SUBPROC_VCC);
 	CAST_OBJ_NOTNULL(vp, priv, VCC_PRIV_MAGIC);
@@ -95,6 +95,9 @@ run_vcc(void *priv)
 
 	sb = VSB_new_auto();
 	XXXAN(sb);
+	vcp = VCP_New();
+	AN(vcp);
+	VCP_Builtin_VCL(vcp, builtin_vcl);
 	VCP_VCL_path(vcp, mgt_vcl_path);
 	VCP_VMOD_path(vcp, mgt_vmod_path);
 	VCP_Err_Unref(vcp, mgt_vcc_err_unref);
@@ -314,14 +317,3 @@ mgt_VccCompile(struct cli *cli, const char *vclname, const char *vclsrc,
 
 	return (vp.libfile);
 }
-
-/*--------------------------------------------------------------------*/
-
-void
-mgt_vcc_init(void)
-{
-
-	vcp = VCP_New();
-	AN(vcp);
-	VCP_Builtin_VCL(vcp, builtin_vcl);
-}