X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=842e030f3eb58cf13257406154f2aeb17c650826;hp=d1f88539b946b571339902bbc9d950a2555365a8;hb=5f25c580aed568f05dd8ec285c2990ad1906b83d;hpb=ce2bb6c458275ec6c0a115a2c814a15761474f11

diff --git a/filter.c b/filter.c
index d1f88539..842e030f 100644
--- a/filter.c
+++ b/filter.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file filter.c the stand-alone filter program */
 
@@ -121,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)
@@ -168,9 +162,9 @@ int main(int argc, char *argv[])
 	sot->loaded = fc->out_loaded;
 	sot->input_eof = &fc->eof;
 
-	register_task(&sot->task);
-	register_task(&fc->task);
 	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);