X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=c021b17bdbefdbcc7e562f496b6ae14917d3d681;hp=8e6d75b1c8b6fe3a1fa9d6865e9d3c71eb0e5843;hb=cad2842e228ab3e42702a05af759ad292b89bed9;hpb=d7b4aa3835197ee906f13f515040e1cda6385544 diff --git a/recv.c b/recv.c index 8e6d75b1..c021b17b 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include "para.h" #include "list.h" @@ -21,6 +20,7 @@ #include "error.h" #include "stdout.h" #include "buffer_tree.h" +#include "version.h" /** The gengetopt args info struct. */ static struct recv_args_info conf; @@ -101,21 +101,22 @@ int main(int argc, char *argv[]) sot.btrn = btr_new_node(&(struct btr_node_description) EMBRACE(.parent = rn.btrn, .name = "stdout")); stdout_set_defaults(&sot); - register_task(&sot.task); + register_task(&s, &sot.task); rn.task.pre_select = r->pre_select; rn.task.post_select = r->post_select; sprintf(rn.task.status, "%s", r->name); - register_task(&rn.task); + register_task(&s, &rn.task); ret = schedule(&s); out: if (r_opened) r->close(&rn); - btr_free_node(rn.btrn); - btr_free_node(sot.btrn); + btr_remove_node(&rn.btrn); + btr_remove_node(&sot.btrn); if (rn.conf) r->free_config(rn.conf); + if (ret < 0) PARA_ERROR_LOG("%s\n", para_strerror(-ret)); return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;