[master] 3635ea3 Eliminate unused arguments.
Poul-Henning Kamp
phk at FreeBSD.org
Tue Aug 19 09:57:01 CEST 2014
commit 3635ea366c0791e9121d4ce8b39872800d2bc6e3
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Aug 19 07:56:23 2014 +0000
Eliminate unused arguments.
diff --git a/bin/varnishd/cache/cache_esi.h b/bin/varnishd/cache/cache_esi.h
index 100e034..454e595 100644
--- a/bin/varnishd/cache/cache_esi.h
+++ b/bin/varnishd/cache/cache_esi.h
@@ -44,6 +44,5 @@ typedef ssize_t vep_callback_t(struct vfp_ctx *, void *priv, ssize_t l,
struct vep_state *VEP_Init(struct vfp_ctx *vc, const struct http *req,
vep_callback_t *cb, void *cb_priv);
-void VEP_Parse(struct vep_state *, const struct busyobj *, const char *p,
- size_t l);
-struct vsb *VEP_Finish(struct vep_state *, const struct busyobj *);
+void VEP_Parse(struct vep_state *, const char *p, size_t l);
+struct vsb *VEP_Finish(struct vep_state *);
diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index 77ed03d..d0f1bc6 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -113,7 +113,7 @@ vfp_esi_end(struct vfp_ctx *vc, struct vef_priv *vef,
CHECK_OBJ_NOTNULL(vc->bo, BUSYOBJ_MAGIC);
CHECK_OBJ_NOTNULL(vef, VEF_MAGIC);
- vsb = VEP_Finish(vef->vep, vc->bo);
+ vsb = VEP_Finish(vef->vep);
if (vsb != NULL) {
if (retval == VFP_END) {
@@ -193,7 +193,7 @@ vfp_esi_gzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
vp = VFP_Suck(vc, vef->ibuf_i, &l);
if (l > 0) {
- VEP_Parse(vef->vep, vc->bo, vef->ibuf_i, l);
+ VEP_Parse(vef->vep, vef->ibuf_i, l);
vef->ibuf_i += l;
assert(vef->ibuf_o >= vef->ibuf && vef->ibuf_o <= vef->ibuf_i);
if (vef->error) {
@@ -248,7 +248,7 @@ vfp_esi_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p, ssize_t *lp)
}
vp = VFP_Suck(vc, p, lp);
if (vp != VFP_ERROR && *lp > 0)
- VEP_Parse(vef->vep, vc->bo, p, *lp);
+ VEP_Parse(vef->vep, p, *lp);
if (vp == VFP_END) {
vp = vfp_esi_end(vc, vef, vp);
vfe->priv1 = NULL;
diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index d028c26..1860b8f 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -566,14 +566,12 @@ vep_do_include(struct vep_state *vep, enum dowhat what)
*/
void
-VEP_Parse(struct vep_state *vep, const struct busyobj *bo, const char *p,
- size_t l)
+VEP_Parse(struct vep_state *vep, const char *p, size_t l)
{
const char *e;
struct vep_match *vm;
int i;
- CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
CHECK_OBJ_NOTNULL(vep, VEP_MAGIC);
assert(l > 0);
@@ -1080,11 +1078,10 @@ VEP_Init(struct vfp_ctx *vc, const struct http *req, vep_callback_t *cb,
*/
struct vsb *
-VEP_Finish(struct vep_state *vep, const struct busyobj *bo)
+VEP_Finish(struct vep_state *vep)
{
ssize_t l, lcb;
- CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
CHECK_OBJ_NOTNULL(vep, VEP_MAGIC);
if (vep->o_pending)
More information about the varnish-commit
mailing list