list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) {
PARA_INFO_LOG("closing %s filter callback\n",
- fn->filter->name);
+ filters[fn->filter_num].name);
close_filter_callback(fcb);
}
}
struct filter_node *fn;
char *ib;
size_t *loaded;
- int conv, conv_total = 0;
+ int i, conv, conv_total = 0;
if (fc->output_error && *fc->output_error < 0) {
t->error = *fc->output_error;
ib = fc->inbuf;
loaded = fc->in_loaded;
conv = 0;
- list_for_each_entry(fn, &fc->filters, node) {
+ FOR_EACH_FILTER_NODE(fn, fc, i) {
+ struct filter *f = filters + fn->filter_num;
if (*loaded && fn->loaded < fn->bufsize) {
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->error = fn->filter->convert(ib, *loaded, fn);
+ t->error = f->convert(ib, *loaded, fn);
if (t->error < 0)
return;
size = t->error;
*/
void close_filters(struct filter_chain *fc)
{
- struct filter_node *fn, *tmp;
+ struct filter_node *fn;
+ int i;
if (!fc)
return;
PARA_NOTICE_LOG("closing filter chain %p\n", fc);
- list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
+ FOR_EACH_FILTER_NODE(fn, fc, i) {
+ struct filter *f = filters + fn->filter_num;
close_callbacks(fn);
- PARA_INFO_LOG("closing %s filter\n", fn->filter->name);
- fn->filter->close(fn);
- list_del(&fn->node);
- free(fn);
+ PARA_INFO_LOG("closing %s filter\n", f->name);
+ f->close(fn);
}
+ free(fc->filter_nodes);
}
/*