X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=db0a4c00bd3e50e127e00c3dccc0cbc0236e3421;hp=17f67058df88c9e128b7afdb5a2a3c0f801e90ad;hb=8cec3d1edb26b4861e2b5bdbb9f70241cdd7f03b;hpb=2a8029478dfc65f0c935d864faf4aea9e3deb27d diff --git a/filter_chain.c b/filter_chain.c index 17f67058..db0a4c00 100644 --- a/filter_chain.c +++ b/filter_chain.c @@ -122,7 +122,7 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t) int conv, conv_total = 0; t->ret = -E_FC_EOF; - if (*fc->output_eof) + if (fc->output_eof && *fc->output_eof) goto err_out; again: ib = fc->inbuf; @@ -141,7 +141,8 @@ again: *loaded -= t->ret; conv += t->ret; if (*loaded && t->ret) { - PARA_INFO_LOG("moving %zd bytes in input buffer for %s filter\n", + PARA_DEBUG_LOG("moving %zd bytes in input " + "buffer for %s filter\n", *loaded, fn->filter->name); memmove(ib, ib + t->ret, *loaded); } @@ -150,8 +151,10 @@ again: loaded = &fn->loaded; } conv_total += conv; - PARA_INFO_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->input_eof, - *fc->output_eof, fc->eof, *fc->out_loaded, conv, conv_total); + PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, " + "conv: %d, conv_total: %d\n", *fc->input_eof, + fc->output_eof? *fc->output_eof : -42, + fc->eof, *fc->out_loaded, conv, conv_total); if (conv) goto again; t->ret = 1;