X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=05f616cd021202a0a373a0bb763b77ce4c98d21d;hp=803965c078078491bbfecdb3eb73209442dc167d;hb=d1e8efc42f76643529053877950034bf99b55c5f;hpb=3dd2078d278f922cb373dc7ed36fa2b18367098f diff --git a/recv.c b/recv.c index 803965c0..05f616cd 100644 --- a/recv.c +++ b/recv.c @@ -92,20 +92,14 @@ 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; - sot.input_error = &rn.task.error; register_task(&sot.task); rn.task.pre_select = r->pre_select; @@ -117,10 +111,8 @@ 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 (ret < 0) PARA_ERROR_LOG("%s\n", para_strerror(-ret));