X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=filter.c;h=722cb16fb35bfaec09bbaca046ebf62931df8036;hb=be5daec66f163725489f42d512659a8af5c3fd59;hp=04640692993bf3413f4d47dbc10add10899148d9;hpb=26a032fffa6c6e6f092ed3d14c2b5f08e5c736d6;p=paraslash.git diff --git a/filter.c b/filter.c index 04640692..722cb16f 100644 --- a/filter.c +++ b/filter.c @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) EMBRACE(.name = "stdin")); stdin_task_register(sit, &s); - fns = alloc(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; @@ -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); @@ -149,8 +149,7 @@ int main(int argc, char *argv[]) EMBRACE(.name = "stdout", .parent = parent)); stdout_task_register(sot, &s); - s.default_timeout.tv_sec = 1; - s.default_timeout.tv_usec = 0; + s.default_timeout = 1000; btr_log_tree(sit->btrn, LL_INFO); ret = schedule(&s); sched_shutdown(&s);