X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=7ef78a90368c7770c58e7878e60fa78aa819da75;hp=55e97f1e49ed6248ec415598d95762ee9f3f82fa;hb=51313fd64c8e40ad4799802ef95332fd765f6f28;hpb=806fcbb5a8c00d6b8c1a228b9b4d6b6758f613ca

diff --git a/recv.c b/recv.c
index 55e97f1e..7ef78a90 100644
--- a/recv.c
+++ b/recv.c
@@ -45,14 +45,6 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 	return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
-static void rn_event_handler(struct task *t)
-{
-	struct receiver_node *rn = t->private_data;
-	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-	rn->error = t->ret;
-	unregister_task(t);
-}
-
 /**
  * the main function of para_recv
  *
@@ -70,11 +62,12 @@ int main(int argc, char *argv[])
 	struct receiver *r = NULL;
 	struct receiver_node rn;
 	struct stdout_task sot;
-	struct sched s;
+	static struct sched s;
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 
+	memset(&sot, 0, sizeof(struct stdout_task));
 	memset(&rn, 0, sizeof(struct receiver_node));
 	for (ret = 0; receivers[ret].name; ret++)
 		receivers[ret].init(&receivers[ret]);
@@ -94,13 +87,11 @@ int main(int argc, char *argv[])
 	stdout_set_defaults(&sot);
 	sot.buf = rn.buf;
 	sot.loaded = &rn.loaded;
-	sot.input_error = &rn.error;
+	sot.input_error = &rn.task.error;
 	register_task(&sot.task);
 
-	rn.task.private_data = &rn;
 	rn.task.pre_select = r->pre_select;
 	rn.task.post_select = r->post_select;
-	rn.task.event_handler = rn_event_handler;
 	sprintf(rn.task.status, "receiver node");
 	register_task(&rn.task);