Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash/

[paraslash.git] / filter_chain.c

diff --git a/filter_chain.c b/filter_chain.c
index 4114ca7743e4987386d6a31bd4cf11809eb9327f..70c3d39554a8b2414b37a515a3977d428b6173b2 100644 (file)
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -124,8 +124,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)
-               goto err_out;
 again:
        ib = fc->inbuf;
        loaded = fc->in_loaded;
@@ -133,8 +131,8 @@ again:
        list_for_each_entry(fn, &fc->filters, node) {
                if (*loaded && fn->loaded < fn->bufsize) {
                        size_t old_fn_loaded = fn->loaded;
-                       PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
-                               fc, *loaded, fn->filter->name);
+//                     PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
+//                             fc, *loaded, fn->filter->name);
                        t->ret = fn->filter->convert(ib, *loaded, fn);
                        if (t->ret < 0)
                                goto err_out;
@@ -143,9 +141,9 @@ again:
                        *loaded -= t->ret;
                        conv += t->ret;
                        if (*loaded && t->ret) {
-                               PARA_DEBUG_LOG("moving %zd bytes in input "
-                                       "buffer for %s filter\n",
-                                       *loaded,  fn->filter->name);
+//                             PARA_DEBUG_LOG("moving %zd bytes in input "
+//                                     "buffer for %s filter\n",
+//                                     *loaded,  fn->filter->name);
                                memmove(ib, ib + t->ret, *loaded);
                        }
                }
@@ -153,10 +151,10 @@ again:
                loaded = &fn->loaded;
        }
        conv_total += conv;
-       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);
+//     PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %zd, "
+//             "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;