X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=f14ea2876fba05a4b8196c4dcafbcf968de32644;hp=5cd64cc7e6058cd7723c9abf847f36a23c8f0a0b;hb=4744d937c4160898d1fe151257606430750e580c;hpb=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8 diff --git a/recv.c b/recv.c index 5cd64cc7..f14ea287 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,8 +8,6 @@ #include #include -#include -#include #include "para.h" #include "list.h" @@ -22,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; @@ -102,12 +101,12 @@ 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: @@ -115,7 +114,8 @@ out: r->close(&rn); btr_free_node(rn.btrn); btr_free_node(sot.btrn); - free(rn.conf); + 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;