update to recent vmodtool changes and remove $Prefix ...

... now that the name clash is resolved

src/Makefile.am

@@ -53,7 +53,8 @@ TESTS = \
 	vtc/vmod_constant.vtc \
 	vtc/vmod_globalvar.vtc \
 	vtc/vmod_taskvar.vtc \
-	vtc/vmod_topvar.vtc
+	vtc/vmod_topvar.vtc \
+	vtc/clash.vtc
 
 $(CS): type_magics.h type_cp.h tbl_types.h
 

src/tasktop.h

@@ -38,7 +38,7 @@
 	vmod_ ## type ## __init(VRT_CTX,				\
 	    struct vmodpfx_ ## type **vp,				\
 	    const char *vcl_name,					\
-	    struct vmod_ ## type ##__init_arg *args)			\
+	    struct VARGS(type ##__init) *args)				\
 	{								\
 		struct vmodpfx_ ## type *v;				\
 									\

src/vmod_constant.c

@@ -72,7 +72,7 @@
 	vmod_ ## type ## __init(VRT_CTX,				\
 	    struct vmodpfx_ ## type **vp,				\
 	    const char *vcl_name,					\
-	    struct vmod_ ## type ##__init_arg *args)			\
+	    struct VARGS(type ##__init) *args)				\
 	{								\
 		struct vmodpfx_ ## type *v;				\
 									\
@@ -126,5 +126,5 @@
 		return (!!v->defined);					\
 	}
 
-#define VCC_TYPE(TYPE, type) var_code(constant_, VMOD_CONSTANT_, constant_constant_, TYPE, type)
+#define VCC_TYPE(TYPE, type) var_code(vmod_, VMOD_CONSTANT_, vmod_constant_, TYPE, type)
 #include "tbl_types.h"

src/vmod_constant.vcctpl

 $Module constant 3 "constants for VCL"
-$Prefix constant
 
 DESCRIPTION
 ===========

src/vmod_globalvar.c

@@ -282,7 +282,7 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) {
 	vmod_ ## type ## __init(VRT_CTX,				\
 	    struct vmodpfx_ ## type **vp,				\
 	    const char *vcl_name,					\
-	    struct vmod_ ## type ##__init_arg *args)			\
+	    struct VARGS(type ##__init) *args)				\
 	{								\
 		struct vmodpfx_ ## type *v;				\
 									\
@@ -348,5 +348,5 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) {
 	}
 
 
-#define VCC_TYPE(TYPE, type) var_code(globalvar_, VMOD_GLOBALVAR_, globalvar_globalvar_, TYPE, type)
+#define VCC_TYPE(TYPE, type) var_code(vmod_, VMOD_GLOBALVAR_, vmod_globalvar_, TYPE, type)
 #include "tbl_types.h"

src/vmod_globalvar.vcctpl

 $Module globalvar 3 "global variables as objects for VCL"
-$Prefix globalvar
 
 DESCRIPTION
 ===========

src/vmod_taskvar.c

@@ -104,5 +104,5 @@ state_l(VRT_CTX, void *v, size_t sz)
 #define VMOD_TASKVAR_STRING_MAGIC	(tv_magic | OBJVAR_STRING_MAGIC)
 #define VMOD_TASKVAR_TIME_MAGIC	(tv_magic | OBJVAR_TIME_MAGIC)
 
-#define VCC_TYPE(TYPE, type) var_code(taskvar_, VMOD_TASKVAR_, taskvar_taskvar_, TYPE, type)
+#define VCC_TYPE(TYPE, type) var_code(vmod_, VMOD_TASKVAR_, vmod_taskvar_, TYPE, type)
 #include "tbl_types.h"

src/vmod_taskvar.vcctpl

 $Module taskvar 3 "task variables as objects for VCL"
-$Prefix taskvar
 
 DESCRIPTION
 ===========

src/vmod_topvar.c

@@ -109,5 +109,5 @@ state_l(VRT_CTX, void *v, size_t sz)
 #define VMOD_TOPVAR_STRING_MAGIC	(tv_magic | OBJVAR_STRING_MAGIC)
 #define VMOD_TOPVAR_TIME_MAGIC		(tv_magic | OBJVAR_TIME_MAGIC)
 
-#define VCC_TYPE(TYPE, type) var_code(topvar_, VMOD_TOPVAR_, topvar_topvar_, TYPE, type)
+#define VCC_TYPE(TYPE, type) var_code(vmod_, VMOD_TOPVAR_, vmod_topvar_, TYPE, type)
 #include "tbl_types.h"

src/vmod_topvar.vcctpl

 $Module topvar 3 "cross-ESI (top) variables as objects for VCL"
-$Prefix topvar
 
 DESCRIPTION
 ===========