X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=0d1c2e243b4e21c221a5abcd23a4f93fa1dce228;hp=608bb8b3bf5eedd8c1bac69d6454f857cb6efaeb;hb=96bdf2d7b6206bb042031f2b13075a56bb8921a3;hpb=7d1805d1559e08e0af701155574aef220925d411 diff --git a/filter.c b/filter.c index 608bb8b3..0d1c2e24 100644 --- a/filter.c +++ b/filter.c @@ -37,7 +37,7 @@ static struct filter_chain *fc = &filter_chain_struct; static struct stdout_task stdout_task_struct; static struct stdout_task *sot = &stdout_task_struct; -struct gengetopt_args_info conf; +struct filter_args_info conf; __printf_2_3 void para_log(int ll, const char* fmt,...) { @@ -113,7 +113,7 @@ static int parse_config(int argc, char *argv[]) struct stat statbuf; int i; - if (cmdline_parser(argc, argv, &conf)) + if (filter_cmdline_parser(argc, argv, &conf)) return -E_FILTER_SYNTAX; if (!cf) { char *home = para_homedir(); @@ -121,7 +121,7 @@ static int parse_config(int argc, char *argv[]) free(home); } if (!stat(cf, &statbuf)) { - if (cmdline_parser_configfile(cf, &conf, 0, 0, 0)) + if (filter_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) return -E_FILTER_SYNTAX; } if (!conf.list_filters_given) @@ -140,7 +140,6 @@ int main(int argc, char *argv[]) int ret; struct sched s; - init_sched(); stdin_set_defaults(sit); sit->buf = para_malloc(sit->bufsize),