X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=3a5b85dde69978e749e87dafc535507d79509ce6;hp=ee94e8ff13fff3c2fdd505e369f1bb88f2ee6e9d;hb=df3c03e72911edb31e7f1e32ebe29dad063e3b70;hpb=a69f67d9b65659cb6a458b8e489895cb45e60b69 diff --git a/filter_chain.c b/filter_chain.c index ee94e8ff..3a5b85dd 100644 --- a/filter_chain.c +++ b/filter_chain.c @@ -133,21 +133,22 @@ again: conv = 0; list_for_each_entry(fn, &fc->filters, node) { if (*loaded && fn->loaded < fn->bufsize) { - size_t old_fn_loaded = fn->loaded; + size_t size, old_fn_loaded = fn->loaded; // 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; - call_callbacks(fn, ib, t->ret, fn->buf + old_fn_loaded, + size = t->ret; + call_callbacks(fn, ib, size, fn->buf + old_fn_loaded, fn->loaded - old_fn_loaded); - *loaded -= t->ret; - conv += t->ret; - if (*loaded && t->ret) { + *loaded -= size; + conv += size; + if (*loaded && size) { // PARA_DEBUG_LOG("moving %zd bytes in input " // "buffer for %s filter\n", // *loaded, fn->filter->name); - memmove(ib, ib + t->ret, *loaded); + memmove(ib, ib + size, *loaded); } } ib = fn->buf;