Convert filters to lopsub.

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index 81901896aef25294a64599c9d77f63bf541f91e4..1deaf6dacb142300519c973a5c1f8c9be4dd75a5 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -57,7 +57,7 @@ __noreturn static void print_help_and_die(void)
        bool d = conf.detailed_help_given;
 
        ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
        bool d = conf.detailed_help_given;
 
        ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);

-       print_filter_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
+       print_filter_helps(d);

        exit(EXIT_SUCCESS);
 }
 
        exit(EXIT_SUCCESS);
 }
 


@@ -109,10 +109,10 @@ int main(int argc, char *argv[])
        const struct filter *f;
        struct btr_node *parent;
        struct filter_node **fns;
        const struct filter *f;
        struct btr_node *parent;
        struct filter_node **fns;

+       struct lls_parse_result *filter_lpr;

 
        filter_cmdline_parser(argc, argv, &conf); /* aborts on errors */
        loglevel = get_loglevel_by_name(conf.loglevel_arg);
 
        filter_cmdline_parser(argc, argv, &conf); /* aborts on errors */
        loglevel = get_loglevel_by_name(conf.loglevel_arg);

-       filter_init();

        ret = parse_config();
        if (ret < 0)
                goto out;
        ret = parse_config();
        if (ret < 0)
                goto out;


@@ -123,22 +123,20 @@ int main(int argc, char *argv[])
        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];
        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];

+               const char *name;

                struct filter_node *fn;
                struct task_info ti;
 
                fn = fns[i] = para_calloc(sizeof(*fn));
                struct filter_node *fn;
                struct task_info ti;
 
                fn = fns[i] = para_calloc(sizeof(*fn));

-               ret = check_filter_arg(fa, &fn->conf);
-               if (ret < 0) {
-                       free(fn);
-                       goto out_cleanup;
-               }
-               fn->filter_num = ret;
+               fn->filter_num = filter_setup(fa, &fn->conf, &filter_lpr);
+               name = filter_name(fn->filter_num);
+               fn->lpr = filter_lpr;
+               PARA_DEBUG_LOG("filter #%d: %s\n", i, name);

                f = filter_get(fn->filter_num);
                f = filter_get(fn->filter_num);

-               PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);

                fn->btrn = btr_new_node(&(struct btr_node_description)
                fn->btrn = btr_new_node(&(struct btr_node_description)

-                       EMBRACE(.name = f->name, .parent = parent,
+                       EMBRACE(.name = name, .parent = parent,

                        .handler = f->execute, .context = fn));
                        .handler = f->execute, .context = fn));

-               ti.name = f->name;
+               ti.name = name;

                ti.pre_select = f->pre_select;
                ti.post_select = f->post_select;
                ti.context = fn;
                ti.pre_select = f->pre_select;
                ti.post_select = f->post_select;
                ti.context = fn;


@@ -156,7 +154,6 @@ int main(int argc, char *argv[])
        btr_log_tree(sit->btrn, LL_INFO);
        ret = schedule(&s);
        sched_shutdown(&s);
        btr_log_tree(sit->btrn, LL_INFO);
        ret = schedule(&s);
        sched_shutdown(&s);

-out_cleanup:

        for (i--; i >= 0; i--) {
                struct filter_node *fn = fns[i];
 
        for (i--; i >= 0; i--) {
                struct filter_node *fn = fns[i];
 


@@ -164,8 +161,8 @@ out_cleanup:
                if (f->close)
                        f->close(fn);
                btr_remove_node(&fn->btrn);
                if (f->close)
                        f->close(fn);
                btr_remove_node(&fn->btrn);

-               if (f->free_config)
-                       f->free_config(fn->conf);
+               if (f->teardown)
+                       f->teardown(fn->lpr, fn->conf);

                free(fn);
        }
        free(fns);
                free(fn);
        }
        free(fns);