filter: Remove non-btr code.

This paves the street for further filter cleanups which will finally
result in the removal of struct filter_chain.

diff --git a/filter.c b/filter.c
index 599aaad97815b67c68464c094866ce4d1bd6e5a4..8ebceb44fd574f9a06c91d9a4c23d897827fc9a0 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -34,11 +34,6 @@ static struct stdin_task stdin_task_struct;
 /** pointer to the stdin task. */
 static struct stdin_task *sit = &stdin_task_struct;
 
-/** The task that filters the data. */
-static struct filter_chain filter_chain_struct;
-/** Pointer to the filter chain. */
-static struct filter_chain *fc = &filter_chain_struct;
-
 /** The task that writes converted data to stdout. */
 static struct stdout_task stdout_task_struct;
 /** Pointer to the stdout task. */
@@ -50,65 +45,6 @@ static struct filter_args_info conf;
 static int loglevel;
 INIT_STDERR_LOGGING(loglevel);
 
-static void open_filters(void)
-{
-       int i;
-       struct filter_node *fn;
-
-       FOR_EACH_FILTER_NODE(fn, fc, i) {
-               struct filter *f = filters + fn->filter_num;
-               f->open(fn);
-               PARA_INFO_LOG("opened %s filter\n", f->name);
-               fc->outbufp = &fn->buf;
-               fc->out_loaded = &fn->loaded;
-       }
-}
-
-static void free_filter_confs(void)
-{
-       int i;
-       struct filter_node *fn;
-
-       FOR_EACH_FILTER_NODE(fn, fc, i)
-               free(fn->conf);
-}
-
-static int init_filter_chain(void)
-{
-       int i, ret;
-       struct filter_node *fn;
-
-       if (!conf.filter_given)
-               return -E_NO_FILTERS;
-       fc->num_filters = conf.filter_given;
-       fc->filter_nodes = para_calloc(fc->num_filters * sizeof(struct filter_node));
-       fc->inbufp = &sit->buf;
-       fc->in_loaded = &sit->loaded;
-       fc->input_error = &sit->task.error;
-       fc->task.error = 0;
-       fc->output_error = &sot->task.error;
-       fc->task.post_select = filter_post_select;
-       sprintf(fc->task.status, "filter chain");
-
-       FOR_EACH_FILTER_NODE(fn, fc, i) {
-               char *fa = conf.filter_arg[i];
-               fn = fc->filter_nodes + i;
-               ret = check_filter_arg(fa, &fn->conf);
-               if (ret < 0)
-                       goto err;
-               fn->filter_num = ret;
-               fn->fc = fc;
-               INIT_LIST_HEAD(&fn->callbacks);
-               PARA_DEBUG_LOG("filter #%d: %s\n", i, filters[fn->filter_num].name);
-       }
-       open_filters();
-       return 1;
-err:
-       free_filter_confs();
-       free(fc->filter_nodes);
-       return ret;
-}
-
 __noreturn static void print_help_and_die(void)
 {
        int d = conf.detailed_help_given;
@@ -154,8 +90,19 @@ static int parse_config(int argc, char *argv[])
        return 1;
 }
 
-/* TODO: support buffer tree, not just a chain. */
-static int __noreturn main_btr(void)
+/**
+ * The main function of para_filter.
+ *
+ * Para_filter reads data from stdin, converts it by using a chain
+ * of filters (specified on the command line) and writes the resulting
+ * data to stdout.
+ *
+ * \param argc Number of command line options.
+ * \param argv Vector of arguments.
+ *
+ * \return \a EXIT_SUCCESS on success, EXIT_FAILURE on errors.
+ */
+int main(int argc, char *argv[])
 {
        static struct sched s;
        int i, ret;
@@ -163,6 +110,10 @@ static int __noreturn main_btr(void)
        struct btr_node *parent;
        struct filter_node **fns;
 
+       filter_init();
+       ret = parse_config(argc, argv);
+       if (ret < 0)
+               goto out;
        sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
        stdin_set_defaults(sit);
        register_task(&sit->task);
@@ -176,7 +127,7 @@ static int __noreturn main_btr(void)
                ret = check_filter_arg(fa, &fn->conf);
                if (ret < 0) {
                        free(fn);
-                       goto out;
+                       goto out_cleanup;
                }
                fn->filter_num = ret;
                f = filters + fn->filter_num;
@@ -197,7 +148,7 @@ static int __noreturn main_btr(void)
        s.default_timeout.tv_usec = 0;
        btr_log_tree(sit->btrn, LL_INFO);
        ret = schedule(&s);
-out:
+out_cleanup:
        for (i--; i >= 0; i--) {
                struct filter_node *fn = fns[i];
 
@@ -210,59 +161,8 @@ out:
        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);
-}
-
-/**
- * The main function of para_filter.
- *
- * Para_filter reads data from stdin, converts it by using a chain
- * of filters (specified on the command line) and writes the resulting
- * data to stdout.
- *
- * \param argc Number of command line options.
- * \param argv Vector of arguments.
- *
- * \return \a EXIT_SUCCESS on success, EXIT_FAILURE on errors.
- */
-int main(int argc, char *argv[])
-{
-       int ret;
-       static struct sched s;
-
-       filter_init();
-       ret = parse_config(argc, argv);
-       if (ret < 0)
-               goto out;
-       if (conf.buffer_tree_given) {
-               ret = main_btr();
-               goto out;
-       }
-       stdin_set_defaults(sit);
-       sit->buf = para_malloc(sit->bufsize),
-
-       ret = init_filter_chain();
-       if (ret < 0)
-               goto out;
-       sit->output_error = &fc->task.error;
-
-       stdout_set_defaults(sot);
-       sot->bufp = fc->outbufp;
-       sot->loaded = fc->out_loaded;
-       sot->input_error = &fc->task.error;
-
-       register_task(&sit->task);
-       register_task(&sot->task);
-       register_task(&fc->task);
-       s.default_timeout.tv_sec = 1;
-       s.default_timeout.tv_usec = 0;
-       ret = schedule(&s);
-       close_filters(fc);
 out:
-       free(sit->buf);
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-       return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
+       exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/ggo/filter.m4 b/ggo/filter.m4
index 8199f408b089c997cf51080cad20d962e578d90d..4e991764f3c764339eddb0aa4e9fa68c732bcaf3 100644 (file)
--- a/ggo/filter.m4
+++ b/ggo/filter.m4
@@ -1,6 +1,5 @@
 include(header.m4)
 include(loglevel.m4)
-include(buffer_tree.m4)
 <qu>
 option "filter" f
 #~~~~~~~~~~~~~~~~