Switch to new acvmod

1 files changed, 19 insertions, 20 deletions

diff --git a/src/variable.c b/src/variable.c
index 8e75ea2..feaaa21 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -1,5 +1,5 @@
 /* This file is part of vmod-variable
-   Copyright (C) 2013-2016 Sergey Poznyakoff
+   Copyright (C) 2013-2017 Sergey Poznyakoff
   
    Vmod-variable is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,9 +24,8 @@
 #include "vrt.h"
 #include "vcc_if.h"
 #include "pthread.h"
+#include "cache/cache.h"
 
-#include "bin/varnishd/cache/cache.h"
-#define VARIABLE_CTX const struct vrt_ctx *
 #define WSPTR(s) ((s)->ws)
 
 /* |hash_size| defines a sequence of symbol table sizes. These are prime
@@ -308,7 +307,7 @@ static struct symtab *global_symtab;
 static pthread_mutex_t global_mtx = PTHREAD_MUTEX_INITIALIZER;
 
 VCL_VOID
-vmod_global_set(VARIABLE_CTX ctx, VCL_STRING name, VCL_STRING value)
+vmod_global_set(VRT_CTX, VCL_STRING name, VCL_STRING value)
 {
 	struct variable *var;
 	int inst;
@@ -331,7 +330,7 @@ vmod_global_set(VARIABLE_CTX ctx, VCL_STRING name, VCL_STRING value)
 }
 
 VCL_STRING
-vmod_global_get(VARIABLE_CTX ctx, VCL_STRING name)
+vmod_global_get(VRT_CTX, VCL_STRING name)
 {
 	char *s;
 	struct variable *var;
@@ -350,13 +349,13 @@ vmod_global_get(VARIABLE_CTX ctx, VCL_STRING name)
 }
 
 VCL_BOOL
-vmod_global_defined(VARIABLE_CTX ctx, VCL_STRING name)
+vmod_global_defined(VRT_CTX, VCL_STRING name)
 {
 	return !!vmod_global_get(ctx, name);
 }
 
 VCL_VOID
-vmod_global_clear(VARIABLE_CTX ctx)
+vmod_global_clear(VRT_CTX)
 {
 	AZ(pthread_mutex_lock(&global_mtx));
 	symtab_clear(global_symtab);
@@ -364,7 +363,7 @@ vmod_global_clear(VARIABLE_CTX ctx)
 }
 
 VCL_VOID
-vmod_global_unset(VARIABLE_CTX ctx, VCL_STRING name)
+vmod_global_unset(VRT_CTX, VCL_STRING name)
 {
 	AZ(pthread_mutex_lock(&global_mtx));
 	symtab_remove(global_symtab, name);
@@ -406,13 +405,13 @@ defvar(struct symtab *vt, const char *name, enum variable_type t,
 }
 
 VCL_VOID
-vmod_clear(VARIABLE_CTX ctx, struct vmod_priv *priv)
+vmod_clear(VRT_CTX, struct vmod_priv *priv)
 {
 	symtab_clear(get_symtab(priv));
 }
 
 VCL_STRING
-vmod_get_string(VARIABLE_CTX ctx, struct vmod_priv *priv, VCL_STRING name)
+vmod_get_string(VRT_CTX, struct vmod_priv *priv, VCL_STRING name)
 {
 	struct variable *var = getvar(get_symtab(priv), name);
 	if (var && var->type == variable_string)
@@ -421,7 +420,7 @@ vmod_get_string(VARIABLE_CTX ctx, struct vmod_priv *priv, VCL_STRING name)
 }
 
 VCL_VOID
-vmod_set_string(VARIABLE_CTX ctx, struct vmod_priv *priv,
+vmod_set_string(VRT_CTX, struct vmod_priv *priv,
 		VCL_STRING name, VCL_STRING value)
 {
 	struct symtab *vt = get_symtab(priv);
@@ -432,13 +431,13 @@ vmod_set_string(VARIABLE_CTX ctx, struct vmod_priv *priv,
 }
 
 VCL_STRING
-vmod_get(VARIABLE_CTX ctx, struct vmod_priv *priv, VCL_STRING name)
+vmod_get(VRT_CTX, struct vmod_priv *priv, VCL_STRING name)
 {
 	return vmod_get_string(ctx, priv, name);
 }
 
 VCL_VOID
-vmod_set(VARIABLE_CTX ctx, struct vmod_priv *priv,
+vmod_set(VRT_CTX, struct vmod_priv *priv,
 	 VCL_STRING name, VCL_STRING value)
 {
 	vmod_set_string(ctx, priv, name, value);
@@ -447,7 +446,7 @@ vmod_set(VARIABLE_CTX ctx, struct vmod_priv *priv,
 #define __cat__(a,b) a ## b
 #define DEFGET(r_type, vcl_type, memb)	                            \
 vcl_type					                    \
-__cat__(vmod_get_,r_type)(VARIABLE_CTX ctx, struct vmod_priv *priv, \
+__cat__(vmod_get_,r_type)(VRT_CTX, struct vmod_priv *priv,	    \
 			  VCL_STRING name)			    \
 {							            \
 	struct variable *var = getvar(get_symtab(priv), name);	    \
@@ -458,7 +457,7 @@ __cat__(vmod_get_,r_type)(VARIABLE_CTX ctx, struct vmod_priv *priv, \
 
 #define DEFSET(r_type, vcl_type, memb)                              \
 VCL_VOID                                                            \
-__cat__(vmod_set_,r_type)(VARIABLE_CTX ctx, struct vmod_priv *priv, \
+__cat__(vmod_set_,r_type)(VRT_CTX, struct vmod_priv *priv,	    \
 			  VCL_STRING name,			    \
 			  vcl_type value)			    \
 {                                                                   \
@@ -477,20 +476,20 @@ DEF(real, VCL_REAL, r)
 DEF(duration, VCL_DURATION, d)
 
 VCL_BOOL
-vmod_defined(VARIABLE_CTX ctx, struct vmod_priv *priv, VCL_STRING name)
+vmod_defined(VRT_CTX, struct vmod_priv *priv, VCL_STRING name)
 {
 	return !!getvar(get_symtab(priv), name);
 }
 
 VCL_STRING
-vmod_type_of(VARIABLE_CTX ctx, struct vmod_priv *priv, VCL_STRING name)
+vmod_type_of(VRT_CTX, struct vmod_priv *priv, VCL_STRING name)
 {
 	struct variable *var = getvar(get_symtab(priv), name);
 	return typestr[var ? var->type : variable_unset];
 }
 
 VCL_VOID
-vmod_unset(VARIABLE_CTX ctx, struct vmod_priv *priv, VCL_STRING name)
+vmod_unset(VRT_CTX, struct vmod_priv *priv, VCL_STRING name)
 {
 	symtab_remove(get_symtab(priv), name);
 }
@@ -704,7 +703,7 @@ setval(union value *val, const char *s, enum variable_type type, char **err)
 }
 
 VCL_VOID
-vmod_regset(VARIABLE_CTX ctx, struct vmod_priv *priv,
+vmod_regset(VRT_CTX, struct vmod_priv *priv,
 	    VCL_STRING vars, VCL_STRING rxs, VCL_STRING input)
 {
 	struct symtab *vt = get_symtab(priv);
@@ -880,7 +879,7 @@ define_param(struct symtab *vt, struct vardef *def,
 }
 
 VCL_VOID
-vmod_queryset(VARIABLE_CTX ctx, struct vmod_priv *priv,
+vmod_queryset(VRT_CTX, struct vmod_priv *priv,
 	      VCL_STRING vars, VCL_STRING query)
 {
 	struct symtab *vt = get_symtab(priv);