X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=7a95b1ebce27427e72579c221eedd8748c73fafd;hp=81258a6a12b51459d21ec00bad628bae009fa015;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=1cefe6a503c74d609db4e99e689d46575a5e40fd diff --git a/filter.c b/filter.c index 81258a6a..7a95b1eb 100644 --- a/filter.c +++ b/filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2012 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -140,7 +140,7 @@ int main(int argc, char *argv[]) EMBRACE(.name = f->name, .parent = parent, .handler = f->execute, .context = fn)); fn->task.pre_select = f->pre_select; - fn->task.post_select = f->post_select; + fn->task.new_post_select = f->new_post_select; f->open(fn); register_task(&s, &fn->task); parent = fn->btrn; @@ -161,13 +161,14 @@ out_cleanup: f = filters + fn->filter_num; if (f->close) f->close(fn); - btr_free_node(fn->btrn); - free(fn->conf); + btr_remove_node(&fn->btrn); + if (f->free_config) + f->free_config(fn->conf); free(fn); } free(fns); - btr_free_node(sit->btrn); - btr_free_node(sot->btrn); + btr_remove_node(&sit->btrn); + btr_remove_node(&sot->btrn); out: if (ret < 0) PARA_EMERG_LOG("%s\n", para_strerror(-ret));