X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=009ac936d55a7e398f623e6c374a4df68e5e06f4;hp=787255af51a6441516a3a90f9cbe1e9f79808c1a;hb=87f0cdf5e33cd50af029c6f79ca8fab943490209;hpb=aa74a903545250506fd4c29791e6f4aef3a01c41 diff --git a/filter_common.c b/filter_common.c index 787255af..009ac936 100644 --- a/filter_common.c +++ b/filter_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -122,7 +122,8 @@ void print_filter_helps(unsigned flags) if (!f->help.short_help) continue; - printf_or_die("\nOptions for %s:", f->name); + printf_or_die("\nOptions for %s (%s):", f->name, + f->help.purpose); ggo_print_help(&f->help, flags); } } @@ -131,18 +132,17 @@ void print_filter_helps(unsigned flags) * Set select timeout of the scheduler. * * \param s The scheduler. - * \param t The task struct of this filter. + * \param context Pointer to the filter node (task context). * * This looks at the status of the btr node of the filter. If data is available * in the input queue of the filter, or if an error occurred, a minimal timeout * for the next select call is requested from the scheduler. Otherwise the * scheduler timeout is left unchanged. */ -void generic_filter_pre_select(struct sched *s, struct task *t) +void generic_filter_pre_select(struct sched *s, void *context) { - struct filter_node *fn = container_of(t, struct filter_node, task); + struct filter_node *fn = context; - t->error = 0; if (btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL) != 0) sched_min_delay(s); }