Merge topic branch t/sf_float into pu

[paraslash.git] / recv_common.c

diff --git a/recv_common.c b/recv_common.c
index 169a49675044d6c63b2b872ee8ba1a94aff9c55d..1939300a7c946d68d1b324ee6beb8c0bf146893b 100644 (file)
--- a/recv_common.c
+++ b/recv_common.c
@@ -41,7 +41,7 @@ int check_receiver_arg(const char *ra, struct lls_parse_result **lprp)
        *lprp = NULL;
        if (!ra || !*ra) {
                argc = 1;
-               argv = para_malloc(2 * sizeof(char*));
+               argv = alloc(2 * sizeof(char*));
                argv[0] = para_strdup("http");
                argv[1] = NULL;
        } else {
@@ -110,7 +110,7 @@ void print_receiver_helps(bool detailed)
  * \return The status of of the receiver node's buffer tree node. That is, the
  * return value of the underlying call to \ref btr_node_status().
  */
-int generic_recv_pre_select(struct sched *s, struct receiver_node *rn)
+int generic_recv_pre_monitor(struct sched *s, struct receiver_node *rn)
 {
        int ret = btr_node_status(rn->btrn, 0, BTR_NT_ROOT);