X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=ccd4487ae206ef11b2e0e96e424370c9129770b2;hp=c4ab323d488da7dc4e1aa1b6fc05af9e88b4b717;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=f48194d3ff2a3983f21cab1553fbe29529f2e790

diff --git a/stdin.c b/stdin.c
index c4ab323d..ccd4487a 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file stdin.c Functions that deal with reading from stdin. */
 
 #include <assert.h>
-#include <stdbool.h>
 #include <regex.h>
 
 #include "para.h"
@@ -34,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);
@@ -56,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
@@ -82,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;
 }
 
 /**
@@ -103,7 +100,7 @@ void stdin_set_defaults(struct stdin_task *sit)
 	int ret;
 
 	sit->task.pre_select = stdin_pre_select;
-	sit->task.post_select = stdin_post_select;
+	sit->task.new_post_select = stdin_post_select;
 	sit->btrp = btr_pool_new("stdin", 128 * 1024);
 	sprintf(sit->task.status, "stdin reader");
 	ret = mark_fd_nonblocking(STDIN_FILENO);