[master] 5aca8b4 Move handling of PRIV_ variables to separate source file before it gets too complicated.

[Poul-Henning Kamp]

commit 5aca8b44ce317901c3be45e918e406ffc1f0930f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 29 08:04:32 2014 +0000

    Move handling of PRIV_ variables to separate source file before it
    gets too complicated.

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index edb0e31..26ad745 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -46,6 +46,7 @@ varnishd_SOURCES = \
 	cache/cache_vary.c \
 	cache/cache_vcl.c \
 	cache/cache_vrt.c \
+	cache/cache_vrt_priv.c \
 	cache/cache_vrt_re.c \
 	cache/cache_vrt_var.c \
 	cache/cache_vrt_vmod.c \
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index c41bcaa..faae807 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -515,16 +515,6 @@ VRT_purge(VRT_CTX, double ttl, double grace, double keep)
 }
 
 /*--------------------------------------------------------------------
- */
-
-void
-VRT_priv_fini(const struct vmod_priv *p)
-{
-	if (p->priv != (void*)0 && p->free != (void*)0)
-		p->free(p->priv);
-}
-
-/*--------------------------------------------------------------------
  * Simple stuff
  */
 
diff --git a/bin/varnishd/cache/cache_vrt_priv.c b/bin/varnishd/cache/cache_vrt_priv.c
new file mode 100644
index 0000000..aab904a
--- /dev/null
+++ b/bin/varnishd/cache/cache_vrt_priv.c
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2014 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Runtime support for compiled VCL programs: private variables
+ */
+
+#include "config.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "cache.h"
+
+#include "cache_backend.h"
+#include "hash/hash_slinger.h"
+#include "vav.h"
+#include "vcl.h"
+#include "vrt.h"
+#include "vrt_obj.h"
+#include "vtcp.h"
+#include "vtim.h"
+/*--------------------------------------------------------------------
+ */
+
+void
+VRT_priv_fini(const struct vmod_priv *p)
+{
+	if (p->priv != (void*)0 && p->free != (void*)0)
+		p->free(p->priv);
+}
+