X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=ee94e8ff13fff3c2fdd505e369f1bb88f2ee6e9d;hp=3684ee6b0304b8c5a381d1b2ce8d06a3aff339bb;hb=fd67350dfc707cb86c14f87dfed81d9ffbf9b5ba;hpb=9dd9f8c0d4628fe341283e78d5c7315a655f079c diff --git a/filter_chain.c b/filter_chain.c index 3684ee6b..ee94e8ff 100644 --- a/filter_chain.c +++ b/filter_chain.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * * 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 @@ -100,6 +100,9 @@ static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen, /** * call the convert function of each filter * + * \param s unused + * \param t the task containing the filter chain + * * This is the core function of the filter subsystem. It loops over the list of * filter nodes determined by \a t and calls the filter's convert function if * there is input available for the filter node in question. If the convert @@ -124,8 +127,6 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t) t->ret = -E_FC_EOF; if (fc->output_eof && *fc->output_eof) goto err_out; - if (fc->input_eof && *fc->input_eof && !*fc->in_loaded) - goto err_out; again: ib = fc->inbuf; loaded = fc->in_loaded; @@ -221,6 +222,8 @@ static int parse_filter_args(int filter_num, char *options, void **conf) argv[0] = para_strdup(f->name); argc += 1; *conf = f->parse_config(argc, argv); + free(argv[0]); + free(argv); return *conf? filter_num : -E_BAD_FILTER_OPTIONS; }