X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=filter_common.c;h=ebda1ee74ad265275017d9ebe6eaf137de317fcb;hb=343f3c63fc3a7f9ca4ba4163c9e4cf06cde8d0c3;hp=a39eefd683ad4092951dd73272ab9968109ed351;hpb=5b4b082e7c37b46d5fa1729dff6496da8840085f;p=paraslash.git diff --git a/filter_common.c b/filter_common.c index a39eefd6..ebda1ee7 100644 --- a/filter_common.c +++ b/filter_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2008 Andre Noll + * Copyright (C) 2005-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -23,17 +23,14 @@ struct filter filters[NUM_SUPPORTED_FILTERS] = {FILTER_ARRAY}; /** * Call the init function of each supported filter. - * - * \param all_filters the array of all supported filters. - * * \sa filter::init */ -void filter_init(struct filter *all_filters) +void filter_init(void) { int i; FOR_EACH_SUPPORTED_FILTER(i) - all_filters[i].init(all_filters + i); + filters[i].init(filters + i); } /** @@ -121,7 +118,7 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t) return; } again: - ib = fc->inbuf; + ib = *fc->inbufp; loaded = fc->in_loaded; conv = 0; FOR_EACH_FILTER_NODE(fn, fc, i) { @@ -155,7 +152,7 @@ again: // fc->eof, *fc->out_loaded, conv, conv_total); if (conv) goto again; - if (!*fc->input_error) + if (*fc->input_error >= 0) return; if (*fc->out_loaded) return;