Kill fields buf, loaded and output_error of struct receiver node.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index d01dab68847fc93912edb7e9c7a1e873cf11a1e5..05f616cd021202a0a373a0bb763b77ce4c98d21d 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -9,6 +9,7 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -20,9 +21,10 @@
 #include "string.h"
 #include "error.h"
 #include "stdout.h"
+#include "buffer_tree.h"
 
-/** the gengetopt args info struct */
-struct recv_args_info conf;
+/** The gengetopt args info struct. */
+static struct recv_args_info conf;
 
 static int loglevel;
 /** Always log to stderr. */
@@ -90,15 +92,14 @@ int main(int argc, char *argv[])
        }
        r = &receivers[receiver_num];
        rn.receiver = r;
+       rn.btrn = btr_new_node("receiver", NULL, NULL, NULL);
        ret = r->open(&rn);
        if (ret < 0)
                goto out;
        r_opened = 1;
 
+       sot.btrn = btr_new_node("stdout", rn.btrn, NULL, NULL);
        stdout_set_defaults(&sot);
-       sot.bufp = &rn.buf;
-       sot.loaded = &rn.loaded;
-       sot.input_error = &rn.task.error;
        register_task(&sot.task);
 
        rn.task.pre_select = r->pre_select;
@@ -110,8 +111,9 @@ int main(int argc, char *argv[])
 out:
        if (r_opened)
                r->close(&rn);
-       if (r)
-               r->shutdown();
+       btr_free_node(rn.btrn);
+       btr_free_node(sot.btrn);
+       free(rn.conf);
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;