X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=b25a0ba013fb03b19cb757d07ff483c9389a0d70;hp=ac1581d12f22a473919633d2e8a5f213c55e2202;hb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0

diff --git a/stdin.c b/stdin.c
index ac1581d1..b25a0ba0 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -33,7 +33,6 @@ static void stdin_pre_select(struct sched *s, struct task *t)
 	struct stdin_task *sit = container_of(t, struct stdin_task, task);
 	int ret;
 
-	t->error = 0;
 	ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
 	if (ret < 0)
 		sched_min_delay(s);
@@ -55,22 +54,21 @@ static void stdin_pre_select(struct sched *s, struct task *t)
  * appears to be readable, data is read from stdin and fed into the buffer
  * tree.
  */
-static void stdin_post_select(struct sched *s, struct task *t)
+static int stdin_post_select(struct sched *s, struct task *t)
 {
 	struct stdin_task *sit = container_of(t, struct stdin_task, task);
 	ssize_t ret;
 	size_t sz, n;
 	char *buf = NULL;
 
-	t->error = 0;
 	ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
-		return;
+		return 0;
 	sz = btr_pool_get_buffer(sit->btrp, &buf);
 	if (sz == 0)
-		return;
+		return 0;
 	/*
 	 * Do not use the maximal size to avoid having only a single buffer
 	 * reference for the whole pool. This is bad because if that single
@@ -81,11 +79,11 @@ static void stdin_post_select(struct sched *s, struct task *t)
 	if (n > 0)
 		btr_add_output_pool(sit->btrp, n, sit->btrn);
 	if (ret >= 0)
-		return;
+		return 0;
 err:
-	btr_remove_node(sit->btrn);
+	btr_remove_node(&sit->btrn);
 	//btr_pool_free(sit->btrp);
-	t->error = ret;
+	return ret;
 }
 
 /**