[master] b97fdbf Flip the order of arguments to make more sense.

[Poul-Henning Kamp]

commit b97fdbfd3329c36cd528bee50e045c42344b5332
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jul 7 09:50:37 2014 +0000

    Flip the order of arguments to make more sense.

diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index 49f2e3d..ba8c065 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -165,8 +165,8 @@ vfp_esi_gzip_init(struct busyobj *bo, struct vfp_entry *vfe)
 }
 
 static enum vfp_status __match_proto__(vfp_pull_f)
-vfp_esi_gzip_pull(struct busyobj *bo, void *p, ssize_t *lp,
-    struct vfp_entry *vfe)
+vfp_esi_gzip_pull(struct busyobj *bo, struct vfp_entry *vfe, void *p,
+   ssize_t *lp)
 {
 	enum vfp_status vp;
 	ssize_t d, l;
@@ -221,7 +221,7 @@ vfp_esi_init(struct busyobj *bo, struct vfp_entry *vfe)
 }
 
 static enum vfp_status __match_proto__(vfp_pull_f)
-vfp_esi_pull(struct busyobj *bo, void *p, ssize_t *lp, struct vfp_entry *vfe)
+vfp_esi_pull(struct busyobj *bo, struct vfp_entry *vfe, void *p, ssize_t *lp)
 {
 	enum vfp_status vp;
 	ssize_t d;
diff --git a/bin/varnishd/cache/cache_fetch_proc.c b/bin/varnishd/cache/cache_fetch_proc.c
index ca3b172..e3585fe 100644
--- a/bin/varnishd/cache/cache_fetch_proc.c
+++ b/bin/varnishd/cache/cache_fetch_proc.c
@@ -165,7 +165,7 @@ VFP_Suck(struct busyobj *bo, void *p, ssize_t *lp)
 		bo->vfp_nxt = vfe;
 		return (vp);
 	} else {
-		vp = vfe->vfp->pull(bo, p, lp, vfe);
+		vp = vfe->vfp->pull(bo, vfe, p, lp);
 		if (vp == VFP_ERROR)
 			(void)VFP_Error(bo, "Fetch filter %s returned %d",
 			    vfe->vfp->name, vp);
diff --git a/bin/varnishd/cache/cache_filter.h b/bin/varnishd/cache/cache_filter.h
index 2f0ce3c..a5716a4 100644
--- a/bin/varnishd/cache/cache_filter.h
+++ b/bin/varnishd/cache/cache_filter.h
@@ -41,7 +41,7 @@ enum vfp_status {
 
 typedef enum vfp_status vfp_init_f(struct busyobj *, struct vfp_entry *);
 typedef enum vfp_status
-    vfp_pull_f(struct busyobj *, void *ptr, ssize_t *len, struct vfp_entry *);
+    vfp_pull_f(struct busyobj *, struct vfp_entry *, void *ptr, ssize_t *len);
 typedef void vfp_fini_f(struct busyobj *, struct vfp_entry *);
 
 struct vfp {
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 7653630..f189785 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -475,7 +475,8 @@ vfp_gzip_init(struct busyobj *bo, struct vfp_entry *vfe)
  */
 
 static enum vfp_status __match_proto__(vfp_pull_f)
-vfp_gunzip_pull(struct busyobj *bo, void *p, ssize_t *lp, struct vfp_entry *vfe)
+vfp_gunzip_pull(struct busyobj *bo, struct vfp_entry *vfe, void *p,
+    ssize_t *lp)
 {
         ssize_t l;
 	struct vgz *vg;
@@ -528,7 +529,8 @@ vfp_gunzip_pull(struct busyobj *bo, void *p, ssize_t *lp, struct vfp_entry *vfe)
  */
 
 static enum vfp_status __match_proto__(vfp_pull_f)
-vfp_gzip_pull(struct busyobj *bo, void *p, ssize_t *lp, struct vfp_entry *vfe)
+vfp_gzip_pull(struct busyobj *bo, struct vfp_entry *vfe, void *p,
+    ssize_t *lp)
 {
         ssize_t l;
 	struct vgz *vg;
@@ -582,8 +584,8 @@ vfp_gzip_pull(struct busyobj *bo, void *p, ssize_t *lp, struct vfp_entry *vfe)
  */
 
 static enum vfp_status __match_proto__(vfp_pull_f)
-vfp_testgunzip_pull(struct busyobj *bo, void *p, ssize_t *lp,
-    struct vfp_entry *vfe)
+vfp_testgunzip_pull(struct busyobj *bo, struct vfp_entry *vfe, void *p,
+    ssize_t *lp)
 {
 	struct vgz *vg;
 	enum vgzret_e vr = VGZ_ERROR;
diff --git a/bin/varnishd/cache/cache_http1_fetch.c b/bin/varnishd/cache/cache_http1_fetch.c
index 4fe1855..22d801a 100644
--- a/bin/varnishd/cache/cache_http1_fetch.c
+++ b/bin/varnishd/cache/cache_http1_fetch.c
@@ -69,8 +69,8 @@ vbf_fetch_number(const char *nbr, int radix)
 /*--------------------------------------------------------------------*/
 
 static enum vfp_status __match_proto__(vfp_pull_f)
-v1f_pull_straight(struct busyobj *bo, void *p, ssize_t *lp,
-    struct vfp_entry *vfe)
+v1f_pull_straight(struct busyobj *bo, struct vfp_entry *vfe, void *p,
+    ssize_t *lp)
 {
 	ssize_t l, lr;
 
@@ -110,8 +110,8 @@ static const struct vfp v1f_straight = {
  */
 
 static enum vfp_status __match_proto__(vfp_pull_f)
-v1f_pull_chunked(struct busyobj *bo, void *p, ssize_t *lp,
-    struct vfp_entry *vfe)
+v1f_pull_chunked(struct busyobj *bo, struct vfp_entry *vfe, void *p,
+    ssize_t *lp)
 {
 	const char *err;
 
@@ -142,7 +142,8 @@ static const struct vfp v1f_chunked = {
 /*--------------------------------------------------------------------*/
 
 static enum vfp_status __match_proto__(vfp_pull_f)
-v1f_pull_eof(struct busyobj *bo, void *p, ssize_t *lp, struct vfp_entry *vfe)
+v1f_pull_eof(struct busyobj *bo, struct vfp_entry *vfe, void *p,
+    ssize_t *lp)
 {
 	ssize_t l, lr;