Skip to content
Permalink
Browse files

gc unused argument

I actually did consider this before, but thought we should keep it
because we are currently dicussing to add a CTX to vmod object
destructors. But this piece of code is unrelated and at any rate the
argument can be added back when we need it.

in short: @Dridi is right
  • Loading branch information...
nigoroll committed Nov 13, 2019
1 parent 2c8aefc commit 381af034a232716737052ac1bbb405306815a6fb
Showing with 3 additions and 5 deletions.
  1. +1 −3 bin/varnishd/cache/cache_vrt_vmod.c
  2. +1 −1 include/vcc_interface.h
  3. +1 −1 lib/libvcc/vcc_vmod.c
@@ -163,12 +163,10 @@ VPI_Vmod_Init(VRT_CTX, struct vmod **hdl, unsigned nbr, void *ptr, int len,
}

void
VPI_Vmod_Unload(VRT_CTX, struct vmod **hdl)
VPI_Vmod_Unload(struct vmod **hdl)
{
struct vmod *v;

(void) ctx;

ASSERT_CLI();

TAKE_OBJ_NOTNULL(v, hdl, VMOD_MAGIC);
@@ -53,7 +53,7 @@ void VPI_count(VRT_CTX, unsigned);

int VPI_Vmod_Init(VRT_CTX, struct vmod **hdl, unsigned nbr, void *ptr, int len,
const char *nm, const char *path, const char *file_id, const char *backup);
void VPI_Vmod_Unload(VRT_CTX, struct vmod **hdl);
void VPI_Vmod_Unload(struct vmod **hdl);

typedef int acl_match_f(VRT_CTX, const VCL_IP);

@@ -358,7 +358,7 @@ vcc_ParseImport(struct vcc *tl)
/* XXX: zero the function pointer structure ?*/
VSB_printf(ifp->fin, "\t\tVRT_priv_fini(&vmod_priv_%.*s);", PF(mod));
VSB_printf(ifp->final,
"\t\tVPI_Vmod_Unload(ctx, &VGC_vmod_%.*s);", PF(mod));
"\t\tVPI_Vmod_Unload(&VGC_vmod_%.*s);", PF(mod));

vj = vjsn_parse(vmd->json, &p);
XXXAZ(p);

0 comments on commit 381af03

Please sign in to comment.
You can’t perform that action at this time.