X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=af62ba6a846663ecc8a08565c7c2f2b6f615ea89;hp=1ca416484e2f9bf9c9aaad649fd1d72fa9c88309;hb=3e3c069366dbb2bf8f157ad0a406bda67dd51783;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/filter.c b/filter.c
index 1ca41648..af62ba6a 100644
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -41,7 +41,7 @@ INIT_STDERR_LOGGING(conf.loglevel_arg);
 
 static void filter_event_handler(struct task *t)
 {
-	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
 	unregister_task(t);
 }
 
@@ -66,9 +66,9 @@ static int init_filter_chain(void)
 
 	fc->inbuf = sit->buf;
 	fc->in_loaded = &sit->loaded;
-	fc->input_eof = &sit->eof;
-	fc->eof = 0;
-	fc->output_eof = &sot->eof;
+	fc->input_error = &sit->error;
+	fc->error = 0;
+	fc->output_error = &sot->error;
 	fc->task.private_data = fc;
 	fc->task.pre_select = filter_pre_select;
 	fc->task.event_handler = filter_event_handler;
@@ -109,7 +109,13 @@ static int parse_config(int argc, char *argv[])
 		free(home);
 	}
 	if (!stat(cf, &statbuf)) {
-		if (filter_cmdline_parser_configfile(cf, &conf, 0, 0, 0))
+		struct filter_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		if (filter_cmdline_parser_config_file(cf, &conf, &params))
 			return -E_FILTER_SYNTAX;
 	}
 	if (!conf.list_filters_given)
@@ -154,18 +160,18 @@ int main(int argc, char *argv[])
 	stdout_set_defaults(sot);
 	sot->buf = fc->outbuf;
 	sot->loaded = fc->out_loaded;
-	sot->input_eof = &fc->eof;
+	sot->input_error = &fc->error;
 
 	register_task(&sit->task);
 	register_task(&fc->task);
 	register_task(&sot->task);
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
-	ret = sched(&s);
+	ret = schedule(&s);
 out:
 	free(sit->buf);
 	close_filters(fc);
 	if (ret < 0)
-		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }