Split vrt functions for variables into a separate source file

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5381 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/Makefile.am

@@ -42,6 +42,7 @@ varnishd_SOURCES = \
 	cache_vcl.c \
 	cache_vrt.c \
 	cache_vrt_re.c \
+	cache_vrt_var.c \
 	cache_vrt_vmod.c \
 	cache_wrw.c \
 	cache_ws.c \

bin/varnishd/cache.h

@@ -43,6 +43,7 @@
 #ifdef HAVE_PTHREAD_NP_H
 #include <pthread_np.h>
 #endif
+#include <stdarg.h>
 #include <stdint.h>
 #include <string.h>
 #include <limits.h>
@@ -708,6 +709,10 @@ void VCL_Poll(void);
 #include "vcl_returns.h"
 #undef VCL_MET_MAC
 
+/* cache_vrt.c */
+
+char *VRT_String(struct ws *ws, const char *h, const char *p, va_list ap);
+
 /* cache_vrt_esi.c */
 
 void ESI_Deliver(struct sess *);

include/vrt.h

@@ -221,4 +221,4 @@ const char *VRT_backend_string(struct sess *sp, const struct director *d);
 		return (1);			\
 	} while (0)
 
-const char *VRT_String(const struct sess *sp, const char *p, ...);
+const char *VRT_WrkString(const struct sess *sp, const char *p, ...);

lib/libvcl/vcc_expr.c

@@ -702,7 +702,7 @@ vcc_expr_add(struct vcc *tl, struct expr **e, enum var_type fmt)
 	}
 	if (fmt != STRING_LIST && (*e)->fmt == STRING_LIST)
 		*e = vcc_expr_edit(STRING,
-		    "\v+VRT_String(sp,\n\v1,\nvrt_magic_string_end)", *e, NULL);
+		    "\v+VRT_WrkString(sp,\n\v1,\nvrt_magic_string_end)", *e, NULL);
 	if (fmt == STRING_LIST && (*e)->fmt == STRING)
 		(*e)->fmt = STRING_LIST;