X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=48673afb478aadd242d5ad4829d78623beedf1f9;hp=e6031e752bf89bfd194d118af42e0914ccb5d989;hb=83ab4b5d38bb63cf4724022c3804d3eaa2ac51d3;hpb=3b447b02e2d74d596ecf6f5f764bf847653d407c

diff --git a/http_recv.c b/http_recv.c
index e6031e75..48673afb 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -15,12 +15,12 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "http_recv.cmdline.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"
-#include "buffer_tree.h"
 
 /**
  * the possible states of a http receiver node
@@ -83,7 +83,9 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 	struct iovec iov[2];
 	size_t num_bytes;
 
-	t->error = 0;
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
 	if (ret < 0)
 		goto out;
@@ -95,7 +97,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 			return;
 		rq = make_request_msg();
 		PARA_INFO_LOG("sending http request\n");
-		ret = send_va_buffer(rn->fd, "%s", rq);
+		ret = write_va_buffer(rn->fd, "%s", rq);
 		free(rq);
 		if (ret < 0)
 			goto out;
@@ -128,7 +130,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 out:
 	if (ret >= 0)
 		return;
-	btr_remove_node(rn->btrn);
+	btr_remove_node(&rn->btrn);
 	t->error = ret;
 }
 
@@ -141,7 +143,7 @@ static void http_recv_close(struct receiver_node *rn)
 
 static void *http_recv_parse_config(int argc, char **argv)
 {
-	struct http_recv_args_info *tmp = para_calloc(sizeof(struct http_recv_args_info));
+	struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
 	if (!http_recv_cmdline_parser(argc, argv, tmp))
 		return tmp;