X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=f42a7dc04d70a8095cc9fe0becb298562710db61;hp=babd1e306989b18f2702ec14ef0e26e5706e99e5;hb=e4efba96ba3f2d77eb75fc27631e590c8be3c879;hpb=42ddd68159d7eff0f3e7c225665c97f9abd59425

diff --git a/recv.c b/recv.c
index babd1e30..f42a7dc0 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -63,8 +63,9 @@ int main(int argc, char *argv[])
 	int ret, r_opened = 0, receiver_num;
 	struct receiver *r = NULL;
 	struct receiver_node rn;
-	struct stdout_task sot;
+	struct stdout_task sot = {.btrn = NULL};
 	static struct sched s;
+	struct task_info ti;
 
 	recv_cmdline_parser(argc, argv, &conf);
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
@@ -89,20 +90,20 @@ int main(int argc, char *argv[])
 		goto out;
 	r_opened = 1;
 
-	memset(&sot, 0, sizeof(struct stdout_task));
 	sot.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.parent = rn.btrn, .name = "stdout"));
-	stdout_set_defaults(&sot);
-	register_task(&s, &sot.task);
+	stdout_task_register(&sot, &s);
 
-	rn.task.pre_select = r->pre_select;
-	rn.task.post_select = r->post_select;
-	sprintf(rn.task.status, "%s", r->name);
-	register_task(&s, &rn.task);
+	ti.name = r->name;
+	ti.pre_select = r->pre_select;
+	ti.post_select = r->post_select;
+	ti.context = &rn;
+	rn.task = task_register(&ti, &s);
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	ret = schedule(&s);
+	sched_shutdown(&s);
 out:
 	if (r_opened)
 		r->close(&rn);