X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=filter.c;h=722cb16fb35bfaec09bbaca046ebf62931df8036;hb=2934ee80367ee9d50b99ed8d7f672d1a397b4ce0;hp=95438779e6aa0c206ec2b07225d3fae1d4a977a5;hpb=fdd8a22e1df57a8c9254e7d0074301e7dde2c557;p=paraslash.git diff --git a/filter.c b/filter.c index 95438779..722cb16f 100644 --- a/filter.c +++ b/filter.c @@ -120,14 +120,14 @@ int main(int argc, char *argv[]) EMBRACE(.name = "stdin")); stdin_task_register(sit, &s); - fns = para_malloc(OPT_GIVEN(FILTER) * sizeof(*fns)); + fns = arr_alloc(OPT_GIVEN(FILTER), sizeof(*fns)); for (i = 0, parent = sit->btrn; i < OPT_GIVEN(FILTER); i++) { const char *fa = lls_string_val(i, OPT_RESULT(FILTER)); const char *name; struct filter_node *fn; struct task_info ti; - fn = fns[i] = para_calloc(sizeof(*fn)); + fn = fns[i] = zalloc(sizeof(*fn)); fn->filter_num = filter_setup(fa, &fn->conf, &filter_lpr); name = filter_name(fn->filter_num); fn->lpr = filter_lpr; @@ -137,8 +137,8 @@ int main(int argc, char *argv[]) EMBRACE(.name = name, .parent = parent, .handler = f->execute, .context = fn)); ti.name = name; - ti.pre_select = f->pre_select; - ti.post_select = f->post_select; + ti.pre_monitor = f->pre_monitor; + ti.post_monitor = f->post_monitor; ti.context = fn; if (f->open) f->open(fn);