Always include stdbool.h.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 05f616cd021202a0a373a0bb763b77ce4c98d21d..b915156ab69da3725088f5b4a59ca1f3c96e7234 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,8 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
-#include <stdbool.h>
 
 #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;
@@ -60,7 +59,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 }
 
 /**
- * the main function of para_recv
+ * The main function of para_recv.
  *
  * \param argc number of arguments
  * \param argv vector of arguments
@@ -92,20 +91,22 @@ int main(int argc, char *argv[])
        }
        r = &receivers[receiver_num];
        rn.receiver = r;
-       rn.btrn = btr_new_node("receiver", NULL, NULL, NULL);
+       rn.btrn = btr_new_node(&(struct btr_node_description)
+               EMBRACE(.name = r->name));
        ret = r->open(&rn);
        if (ret < 0)
                goto out;
        r_opened = 1;
 
-       sot.btrn = btr_new_node("stdout", rn.btrn, NULL, NULL);
+       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, "receiver node");
-       register_task(&rn.task);
+       sprintf(rn.task.status, "%s", r->name);
+       register_task(&s, &rn.task);
 
        ret = schedule(&s);
 out:
@@ -113,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;