Commit 39a84e09 authored by Geoff Simmons's avatar Geoff Simmons

Use methods object for privs after Varnish refactoring.

parent 8c00786e
...@@ -749,7 +749,7 @@ vmod_random(VRT_CTX, struct VARGS(random)*args) ...@@ -749,7 +749,7 @@ vmod_random(VRT_CTX, struct VARGS(random)*args)
rnd_task->priv = rnd_blob; rnd_task->priv = rnd_blob;
rnd_task->len = sizeof(*rnd_blob); rnd_task->len = sizeof(*rnd_blob);
rnd_task->free = NULL; AZ(rnd_task->methods);
return rnd_blob; return rnd_blob;
} }
...@@ -951,11 +951,12 @@ vmod_wipe(VRT_CTX, VCL_BLOB b) ...@@ -951,11 +951,12 @@ vmod_wipe(VRT_CTX, VCL_BLOB b)
/* Function fileread */ /* Function fileread */
static void static void
filedata_free(void *p) filedata_free(VRT_CTX, void *p)
{ {
struct filedata_head *fhead; struct filedata_head *fhead;
struct filedata *f; struct filedata *f;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
if (p == NULL) if (p == NULL)
return; return;
fhead = p; fhead = p;
...@@ -981,6 +982,14 @@ filedata_free(void *p) ...@@ -981,6 +982,14 @@ filedata_free(void *p)
free(fhead); free(fhead);
} }
#define VMOD_GCRYPT_FILE_MAGIC 0x9e381c85
static const struct vmod_priv_methods file_priv_task_methods[1] = {{
.magic = VMOD_PRIV_METHODS_MAGIC,
.type = "vmod_gcrypt_file_priv_task",
.fini = filedata_free,
}};
VCL_BLOB VCL_BLOB
vmod_fileread(VRT_CTX, struct vmod_priv *task, VCL_STRING path) vmod_fileread(VRT_CTX, struct vmod_priv *task, VCL_STRING path)
{ {
...@@ -1014,7 +1023,7 @@ vmod_fileread(VRT_CTX, struct vmod_priv *task, VCL_STRING path) ...@@ -1014,7 +1023,7 @@ vmod_fileread(VRT_CTX, struct vmod_priv *task, VCL_STRING path)
VSLIST_INIT(fhead); VSLIST_INIT(fhead);
task->priv = fhead; task->priv = fhead;
task->len = sizeof(*fhead); task->len = sizeof(*fhead);
task->free = filedata_free; task->methods = file_priv_task_methods;
} }
else else
fhead = task->priv; fhead = task->priv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment