[master] 26f659f Be consistent with the parameter naming on VSC_F macro definitions

[Martin Blix Grydeland]

commit 26f659f07b9d90fb0106a379ca6626625b39a6cd
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Fri Jan 16 13:47:38 2015 +0100

    Be consistent with the parameter naming on VSC_F macro definitions

diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 015075e..5bf3608 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -93,7 +93,7 @@ pool_sumstat(const struct dstat *src)
 	Lck_AssertHeld(&wstat_mtx);
 #define L0(n)
 #define L1(n) (VSC_C_main->n += src->n)
-#define VSC_F(n, t, l, f, v, d, e) L##l(n);
+#define VSC_F(n, t, l, f, v, e, d) L##l(n);
 #include "tbl/vsc_f_main.h"
 #undef VSC_F
 #undef L0
@@ -132,7 +132,7 @@ pool_addstat(struct dstat *dst, struct dstat *src)
 	dst->summs++;
 #define L0(n)
 #define L1(n) (dst->n += src->n)
-#define VSC_F(n, t, l, f, v, d, e) L##l(n);
+#define VSC_F(n, t, l, f, v, e, d) L##l(n);
 #include "tbl/vsc_f_main.h"
 #undef VSC_F
 #undef L0
diff --git a/include/vapi/vsc.h b/include/vapi/vsc.h
index 88be5d9..039f839 100644
--- a/include/vapi/vsc.h
+++ b/include/vapi/vsc.h
@@ -190,7 +190,7 @@ const struct VSC_level_desc *VSC_LevelDesc(unsigned level);
 #undef VSC_TYPE_F
 
 #define VSC_DO(U,l,t) extern const struct VSC_desc VSC_desc_##l[];
-#define VSC_F(n,t,l,f,v,d,e)
+#define VSC_F(n,t,l,f,v,e,d)
 #define VSC_DONE(U,l,t)
 #include "tbl/vsc_all.h"
 #undef VSC_DO
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index cd8bdc0..4dc7205 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -387,7 +387,7 @@ vsc_add_pt(struct vsc *vsc, const volatile void *ptr,
 		CHECK_OBJ_NOTNULL(vsc, VSC_MAGIC);			\
 		st = vf->fantom.b;
 
-#define VSC_F(nn,tt,ll,ff,vv,dd,ee)					\
+#define VSC_F(nn,tt,ll,ff,vv,ee,dd)					\
 		vsc_add_pt(vsc, &st->nn, descs++, vf);
 
 #define VSC_DONE(U,l,t)							\
@@ -437,7 +437,7 @@ vsc_build_pt_list(struct VSM_data *vd)
 		CHECK_OBJ_NOTNULL(vf, VSC_VF_MAGIC);		\
 		if (!strcmp(vf->fantom.type, t))		\
 			iter_##l(vsc, VSC_desc_##l, vf);
-#define VSC_F(n,t,l,f,v,d,e)
+#define VSC_F(n,t,l,f,v,e,d)
 #define VSC_DONE(a,b,c)
 #include "tbl/vsc_all.h"
 #undef VSC_DO
@@ -565,7 +565,7 @@ VSC_LevelDesc(unsigned level)
 #undef VSC_TYPE_F
 
 #define VSC_DO(U,l,t)		const struct VSC_desc VSC_desc_##l[] = {
-#define VSC_F(n,t,l,f,v,d,e)		{#n,#t,f,d,e,&VSC_level_desc_##v},
+#define VSC_F(n,t,l,f,v,e,d)		{#n,#t,f,e,d,&VSC_level_desc_##v},
 #define VSC_DONE(U,l,t)		};
 #include "tbl/vsc_all.h"
 #undef VSC_DO