X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=f9e5b9337f2e6775f0605d19e579438439e762d0;hp=3a3d142692aeab0018c13770d7eab1a94502cccc;hb=335730538150250f32c0df0b184fb494e2bb0df3;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a

diff --git a/recv.c b/recv.c
index 3a3d1426..f9e5b933 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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->eof = 1;
-	unregister_task(t);
-}
-
 /**
  * the main function of para_recv
  *
@@ -81,7 +73,7 @@ int main(int argc, char *argv[])
 	ret = -E_RECV_SYNTAX;
 	rn.conf = parse_config(argc, argv, &receiver_num);
 	if (!rn.conf) {
-		PARA_EMERG_LOG("%s", "parse failed\n");
+		PARA_EMERG_LOG("parse failed\n");
 		goto out;
 	}
 	r = &receivers[receiver_num];
@@ -94,23 +86,21 @@ int main(int argc, char *argv[])
 	stdout_set_defaults(&sot);
 	sot.buf = rn.buf;
 	sot.loaded = &rn.loaded;
-	sot.input_eof = &rn.eof;
+	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);
 
-	ret = sched(&s);
+	ret = schedule(&s);
 out:
 	if (r_opened)
 		r->close(&rn);
 	if (r)
 		r->shutdown();
 	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }