X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=1fb5e25e700ea6bb6b2975fef7d6a34523b8cd9f;hp=9b63f517cd77cccd27db0cd4ddcc1dae99c8e082;hb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;hpb=8aa0f575bcca12ab63ab53141c2144448c457478 diff --git a/recv.c b/recv.c index 9b63f517..1fb5e25e 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,21 +8,25 @@ #include #include -#include #include "para.h" #include "list.h" #include "sched.h" #include "ggo.h" +#include "buffer_tree.h" #include "recv.h" #include "recv.cmdline.h" #include "fd.h" #include "string.h" #include "error.h" #include "stdout.h" -#include "buffer_tree.h" #include "version.h" +extern void afh_recv_init(struct receiver *r); +#undef AFH_RECEIVER +#define AFH_RECEIVER {.name = "afh", .init = afh_recv_init}, +DEFINE_RECEIVER_ARRAY; + /** The gengetopt args info struct. */ static struct recv_args_info conf; @@ -113,10 +117,11 @@ int main(int argc, char *argv[]) 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;