Add btr support for the amp filter.

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index c76b6c46e65a453fcd579d7cee2cb4408de45639..c3848946c8b124e1a0ba0f0672fbbf475d6de2a4 100644 (file)
--- a/write.c
+++ b/write.c
@@ -299,37 +299,35 @@ static int main_btr(struct sched *s)
        cwt->task.error = 0;
        register_task(&cwt->task);
 
-       wns = para_malloc(conf.writer_given * sizeof(*wns));
+       PARA_CRIT_LOG("writers:\n");
 
-       for (i = 0; i < conf.writer_given; i++) {
-               struct writer_node *wn = para_calloc(sizeof(*wn));
-               struct writer *w;
-               const char *name;
-
-               ret = -E_WRITE_SYNTAX;
-               wn->conf = check_writer_arg(conf.writer_arg[i],
-                       &wn->writer_num);
-               if (!wn->conf)
+       ret = -E_WRITE_SYNTAX;
+       if (!conf.writer_given) {
+               i = 0;
+               wns = para_malloc(sizeof(*wns));
+               wns[0] = setup_writer_node(NULL, cwt->btrn);
+               if (!wns[0])
                        goto out;
-               w = writers + wn->writer_num;
-               name = writer_names[wn->writer_num];
-               wn->btrn = btr_new_node(name, cwt->btrn, w->execute, wn);
-               sprintf(wn->task.status, "%s", name);
-               w->open(wn);
-               wn->task.post_select = w->post_select_btr;
-               wn->task.pre_select = w->pre_select_btr;
-               register_task(&wn->task);
-               wns[i] = wn;
+       } else {
+               wns = para_malloc(conf.writer_given * sizeof(*wns));
+               for (i = 0; i < conf.writer_given; i++) {
+                       PARA_CRIT_LOG("i: %d\n", i);
+                       wns[i] = setup_writer_node(conf.writer_arg[i],
+                               cwt->btrn);
+                       if (!wns[i])
+                               goto out;
+               }
        }
-       i--;
 
        s->default_timeout.tv_sec = 10;
        s->default_timeout.tv_usec = 50000;
        ret = schedule(s);
 out:
-       for (; i >= 0; i--) {
+       for (i--; i >= 0; i--) {
                struct writer_node *wn = wns[i];
-               free(wn->conf);
+               struct writer *w = writers + wn->writer_num;
+               w->close(wn);
+               free(wn->conf); /* FIXME should call gengetopt cleanup funtion */
                free(wn);
        }
        free(wns);