X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_recv.c;h=e320fdee65627665d1247da98ddc68ff0786b364;hp=774ae88c14fd048a9c3a6f1eff18d322b8090352;hb=69a294cd641c623db61f46ee86901845789a1c7b;hpb=2f07d34b5d4c37606be5849b6ee51e0443707898

diff --git a/afh_recv.c b/afh_recv.c
index 774ae88c..e320fdee 100644
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -60,7 +60,6 @@ static int afh_execute(struct btr_node *btrn, const char *cmd, char **result)
 		if (x >= pard->afhi.chunks_total)
 			return -ERRNO_TO_PARA_ERROR(EINVAL);
 		pard->first_chunk = pard->current_chunk = x;
-		rn->task.error = 0;
 		return 1;
 	}
 	return -E_BTR_NAVAIL;
@@ -70,10 +69,8 @@ static void *afh_recv_parse_config(int argc, char **argv)
 {
 	struct afh_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
-	if (!afh_recv_cmdline_parser(argc, argv, tmp))
-		return tmp;
-	free(tmp);
-	return NULL;
+	afh_recv_cmdline_parser(argc, argv, tmp);
+	return tmp;
 }
 
 static void afh_recv_free_config(void *conf)
@@ -155,7 +152,7 @@ static void afh_recv_close(struct receiver_node *rn)
 
 static void afh_recv_pre_select(struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = task_context(t);
 	struct private_afh_recv_data *pard = rn->private_data;
 	struct afh_info *afhi = &pard->afhi;
 	struct afh_recv_args_info *conf = rn->conf;
@@ -175,7 +172,7 @@ static void afh_recv_pre_select(struct sched *s, struct task *t)
 
 static int afh_recv_post_select(__a_unused struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = task_context(t);
 	struct afh_recv_args_info *conf = rn->conf;
 	struct private_afh_recv_data *pard = rn->private_data;
 	struct btr_node *btrn = rn->btrn;
@@ -256,9 +253,6 @@ void afh_recv_init(struct receiver *r)
 	r->parse_config = afh_recv_parse_config;
 	r->free_config = afh_recv_free_config;
 	r->execute = afh_execute;
-	r->help = (struct ggo_help) {
-		.short_help = afh_recv_args_info_help,
-		.detailed_help = afh_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(afh_recv);
 	afh_recv_cmdline_parser_free(&dummy);
 }