X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=1deaf6dacb142300519c973a5c1f8c9be4dd75a5;hp=b3dc022e37f5ceaaca680f63a25173e46ba398d4;hb=4adde8dae3317fa83b81e7a860c9ed9133e99bb0;hpb=a731a7c6e78fb137268b42062d9fb08b4e49a2c8

diff --git a/filter.c b/filter.c
index b3dc022e..1deaf6da 100644
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -21,14 +21,20 @@
 #include "error.h"
 #include "version.h"
 
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
+
 /** The list of all status items used by para_{server,audiod,gui}. */
 const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 
+/**
+ * Dummy version which only contains NULL pointers.
+ *
+ * This is used by the amp filter which first tries to obtain the amplification
+ * value from an element in this array.
+ */
 char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
 
-/** Initialize the array of errors for para_filter. */
-INIT_FILTER_ERRLISTS;
-
 /** The task that reads from stdin. */
 static struct stdin_task stdin_task_struct;
 /** pointer to the stdin task. */
@@ -51,8 +57,8 @@ __noreturn static void print_help_and_die(void)
 	bool d = conf.detailed_help_given;
 
 	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
-	print_filter_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
-	exit(0);
+	print_filter_helps(d);
+	exit(EXIT_SUCCESS);
 }
 
 static int parse_config(void)
@@ -100,64 +106,63 @@ int main(int argc, char *argv[])
 {
 	static struct sched s;
 	int i, ret;
-	struct filter *f;
+	const struct filter *f;
 	struct btr_node *parent;
 	struct filter_node **fns;
+	struct lls_parse_result *filter_lpr;
 
 	filter_cmdline_parser(argc, argv, &conf); /* aborts on errors */
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
-	filter_init();
 	ret = parse_config();
 	if (ret < 0)
 		goto out;
 	sit->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdin"));
-	stdin_set_defaults(sit);
-	register_task(&s, &sit->task);
+	stdin_task_register(sit, &s);
 
 	fns = para_malloc(conf.filter_given * sizeof(*fns));
 	for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) {
 		char *fa = conf.filter_arg[i];
+		const char *name;
 		struct filter_node *fn;
+		struct task_info ti;
 
 		fn = fns[i] = para_calloc(sizeof(*fn));
-		ret = check_filter_arg(fa, &fn->conf);
-		if (ret < 0) {
-			free(fn);
-			goto out_cleanup;
-		}
-		fn->filter_num = ret;
-		f = filters + fn->filter_num;
-		sprintf(fn->task.status, "%s", f->name);
-		PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);
+		fn->filter_num = filter_setup(fa, &fn->conf, &filter_lpr);
+		name = filter_name(fn->filter_num);
+		fn->lpr = filter_lpr;
+		PARA_DEBUG_LOG("filter #%d: %s\n", i, name);
+		f = filter_get(fn->filter_num);
 		fn->btrn = btr_new_node(&(struct btr_node_description)
-			EMBRACE(.name = f->name, .parent = parent,
+			EMBRACE(.name = name, .parent = parent,
 			.handler = f->execute, .context = fn));
-		fn->task.pre_select = f->pre_select;
-		fn->task.post_select = f->post_select;
-		f->open(fn);
-		register_task(&s, &fn->task);
+		ti.name = name;
+		ti.pre_select = f->pre_select;
+		ti.post_select = f->post_select;
+		ti.context = fn;
+		if (f->open)
+			f->open(fn);
+		fn->task = task_register(&ti, &s);
 		parent = fn->btrn;
 	}
 	sot->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdout", .parent = parent));
-	stdout_set_defaults(sot);
-	register_task(&s, &sot->task);
+	stdout_task_register(sot, &s);
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	btr_log_tree(sit->btrn, LL_INFO);
 	ret = schedule(&s);
-out_cleanup:
+	sched_shutdown(&s);
 	for (i--; i >= 0; i--) {
 		struct filter_node *fn = fns[i];
 
-		f = filters + fn->filter_num;
+		f = filter_get(fn->filter_num);
 		if (f->close)
 			f->close(fn);
 		btr_remove_node(&fn->btrn);
-		if (f->free_config)
-			f->free_config(fn->conf);
+		if (f->teardown)
+			f->teardown(fn->lpr, fn->conf);
 		free(fn);
 	}
 	free(fns);