X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=f0b6095da6b5c9a012b6e7c7da13180a06803863;hp=b39874448668466c6b351871b56b681a25ee58e5;hb=7ab176a3b0771cfcdd8ee103cd5452e971d12e26;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf diff --git a/filter_chain.c b/filter_chain.c index b3987444..f0b6095d 100644 --- a/filter_chain.c +++ b/filter_chain.c @@ -1,11 +1,14 @@ /* - * Copyright (C) 2005-2007 Andre Noll + * Copyright (C) 2005-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file filter_chain.c common helper functions for filter input/output */ +#include +#include + #include "para.h" #include "list.h" #include "sched.h" @@ -112,9 +115,10 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t) size_t *loaded; int conv, conv_total = 0; - t->ret = -E_FC_EOF; - if (fc->output_eof && *fc->output_eof) + if (fc->output_error && *fc->output_error) { + t->ret = *fc->output_error; goto err_out; + } again: ib = fc->inbuf; loaded = fc->in_loaded; @@ -150,7 +154,7 @@ again: if (conv) goto again; t->ret = 1; - if (!*fc->input_eof) + if (!*fc->input_error) return; if (*fc->out_loaded) return; @@ -158,7 +162,7 @@ again: return; t->ret = -E_FC_EOF; err_out: - fc->eof = 1; + fc->error = t->ret; } /**