[btr] Split btr_del_node() into two functions.

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index ed8cde41b3a650c028ab6b365f642b8a5604f3ab..832ca22bdaec105b5c4fc2e459b3770e6730acfb 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -161,19 +161,22 @@ static int __noreturn main_btr(void)
        int i, ret;
        struct filter *f;
        struct btr_node *parent;
+       struct filter_node **fns;
 
        sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
        stdin_set_defaults(sit);
        register_task(&sit->task);
 
+       fns = para_malloc(conf.filter_given * sizeof(*fns));
        for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) {
                char *fa = conf.filter_arg[i];
-               struct filter_node *fn = para_calloc(sizeof(*fn));
+               struct filter_node *fn;
 
+               fn = fns[i] = para_calloc(sizeof(*fn));
                ret = check_filter_arg(fa, &fn->conf);
                if (ret < 0) {
                        free(fn);
-                       goto err;
+                       goto out;
                }
                fn->filter_num = ret;
                f = filters + fn->filter_num;
@@ -194,7 +197,19 @@ static int __noreturn main_btr(void)
        s.default_timeout.tv_usec = 0;
        btr_log_tree(sit->btrn, LL_INFO);
        ret = schedule(&s);
-err:
+out:
+       for (i--; i >= 0; i--) {
+               struct filter_node *fn = fns[i];
+
+               f = filters + fn->filter_num;
+               f->close(fn);
+               btr_free_node(fn->btrn);
+               free(fn->conf);
+               free(fn);
+       }
+       free(fns);
+       btr_free_node(sit->btrn);
+       btr_free_node(sot->btrn);
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", para_strerror(-ret));
        exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);