X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=81d5df1a635044e61ee66aba03eca876c8bee398;hp=af62ba6a846663ecc8a08565c7c2f2b6f615ea89;hb=93ea9f34dcb35755568e6c94f9b9445fd4d1984a;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde

diff --git a/filter.c b/filter.c
index af62ba6a..81d5df1a 100644
--- a/filter.c
+++ b/filter.c
@@ -39,19 +39,15 @@ static struct filter_args_info conf;
 
 INIT_STDERR_LOGGING(conf.loglevel_arg);
 
-static void filter_event_handler(struct task *t)
-{
-	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-	unregister_task(t);
-}
-
 static void open_filters(void)
 {
+	int i;
 	struct filter_node *fn;
 
-	list_for_each_entry(fn, &fc->filters, node) {
-		fn->filter->open(fn);
-		PARA_INFO_LOG("opened %s filter\n", fn->filter->name);
+	FOR_EACH_FILTER_NODE(fn, fc, i) {
+		struct filter *f = filters + fn->filter_num;
+		f->open(fn);
+		PARA_INFO_LOG("opened %s filter\n", f->name);
 		fc->outbuf = fn->buf;
 		fc->out_loaded = &fn->loaded;
 	}
@@ -59,37 +55,32 @@ static void open_filters(void)
 
 static int init_filter_chain(void)
 {
-	int i, filter_num;
+	int i, ret;
 	struct filter_node *fn;
 
-	INIT_LIST_HEAD(&fc->filters);
-
+	if (!conf.filter_given)
+		return -E_NO_FILTERS;
+	fc->num_filters = conf.filter_given;
+	fc->filter_nodes = para_malloc(fc->num_filters * sizeof(struct filter_node));
 	fc->inbuf = sit->buf;
 	fc->in_loaded = &sit->loaded;
-	fc->input_error = &sit->error;
-	fc->error = 0;
-	fc->output_error = &sot->error;
-	fc->task.private_data = fc;
+	fc->input_error = &sit->task.error;
+	fc->task.error = 0;
+	fc->output_error = &sot->task.error;
 	fc->task.pre_select = filter_pre_select;
-	fc->task.event_handler = filter_event_handler;
 	sprintf(fc->task.status, "filter chain");
 
-	for (i = 0; i < conf.filter_given; i++) {
+	FOR_EACH_FILTER_NODE(fn, fc, i) {
 		char *fa = conf.filter_arg[i];
-		fn = para_calloc(sizeof(struct filter_node));
-		filter_num = check_filter_arg(fa, &fn->conf);
-		if (filter_num < 0) {
-			free(fn);
-			return filter_num;
-		}
+		fn = fc->filter_nodes + i;
+		ret = check_filter_arg(fa, &fn->conf);
+		if (ret < 0)
+			return ret;
+		fn->filter_num = ret;
 		fn->fc = fc;
 		INIT_LIST_HEAD(&fn->callbacks);
-		fn->filter = &filters[filter_num];
-		PARA_DEBUG_LOG("adding %s to filter chain\n", fn->filter->name);
-		list_add_tail(&fn->node, &fc->filters);
+		PARA_DEBUG_LOG("filter #%d: %s\n", i, filters[fn->filter_num].name);
 	}
-	if (list_empty(&fc->filters))
-		return -E_NO_FILTERS;
 	open_filters();
 	return 1;
 }
@@ -160,7 +151,7 @@ int main(int argc, char *argv[])
 	stdout_set_defaults(sot);
 	sot->buf = fc->outbuf;
 	sot->loaded = fc->out_loaded;
-	sot->input_error = &fc->error;
+	sot->input_error = &fc->task.error;
 
 	register_task(&sit->task);
 	register_task(&fc->task);