recv: Use buffer tree API unconditionally.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index ca505561f2a1dbb65f4426ff29fd4fb44888a3b0..70866a35bb7c96a9157570a140b03eddc9043845 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -92,16 +92,13 @@ int main(int argc, char *argv[])
        }
        r = &receivers[receiver_num];
        rn.receiver = r;
-       if (conf.buffer_tree_given)
-               rn.btrn = btr_new_node("receiver", NULL, NULL, NULL);
+       rn.btrn = btr_new_node("receiver", NULL, NULL, NULL);
        ret = r->open(&rn);
        if (ret < 0)
                goto out;
        r_opened = 1;
 
-       if (conf.buffer_tree_given)
-               sot.btrn = btr_new_node("stdout", rn.btrn, NULL, NULL);
-
+       sot.btrn = btr_new_node("stdout", rn.btrn, NULL, NULL);
        stdout_set_defaults(&sot);
        sot.bufp = &rn.buf;
        sot.loaded = &rn.loaded;
@@ -117,13 +114,9 @@ int main(int argc, char *argv[])
 out:
        if (r_opened)
                r->close(&rn);
-       if (conf.buffer_tree_given) {
-               btr_free_node(rn.btrn);
-               btr_free_node(sot.btrn);
-       }
+       btr_free_node(rn.btrn);
+       btr_free_node(sot.btrn);
        free(rn.conf);
-       if (r)
-               r->shutdown();
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;