{
struct filter_callback *fcb, *tmp;
- list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node)
+ list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) {
+ PARA_INFO_LOG("closing %s filter callback\n",
+ fn->filter->name);
close_filter_callback(fcb);
+ }
}
static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
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;
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;
*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);
}
}
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->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;
if (!fc)
return;
- PARA_DEBUG_LOG("closing filter chain %p\n", fc);
+ PARA_NOTICE_LOG("closing filter chain %p\n", fc);
list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
- PARA_NOTICE_LOG("closing %s filter callbacks (fc %p, fn %p)\n", fn->filter->name, fc, fn);
close_callbacks(fn);
- PARA_NOTICE_LOG("closing %s filter (fc %p, fn %p)\n", fn->filter->name, fc, fn);
+ PARA_INFO_LOG("closing %s filter\n", fn->filter->name);
fn->filter->close(fn);
list_del(&fn->node);
free(fn);