X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=filter.c;h=722cb16fb35bfaec09bbaca046ebf62931df8036;hb=68c0deb1ae25af923fde02952159c1129a281813;hp=05d1d4d380d340b5d42b73839a3d1c081d66b3b9;hpb=610cb53b94af8e95326cd44b7845f35cffdb6bf3;p=paraslash.git

diff --git a/filter.c b/filter.c
index 05d1d4d3..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 = 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;
 		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);
@@ -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);