X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=40f02c1cef0a945546966fef4f2cea033d54fc17;hp=bb922dd168f645ebf61b17c11726e705d2b8c6e8;hb=9ae0041ae0dd073657862c4abdf3886a66035ee9;hpb=61a4bf7d89c6757957c4171c67dcb11de111eef5

diff --git a/stdin.c b/stdin.c
index bb922dd1..40f02c1c 100644
--- a/stdin.c
+++ b/stdin.c
@@ -28,7 +28,7 @@
  * buffer of the stdin task, it adds \p STDIN_FILENO to the read fd set
  * of \a s.
  */
-void stdin_pre_select(struct sched *s, struct task *t)
+static void stdin_pre_select(struct sched *s, struct task *t)
 {
 	struct stdin_task *sit = t->private_data;
 	t->ret = 1;
@@ -41,7 +41,7 @@ void stdin_pre_select(struct sched *s, struct task *t)
 
 static void stdin_default_event_handler(struct task *t)
 {
-	PARA_NOTICE_LOG("%p: %s\n", t, PARA_STRERROR(-t->ret));
+	PARA_NOTICE_LOG("%p: %s\n", t, para_strerror(-t->ret));
 	unregister_task(t);
 }
 
@@ -56,7 +56,7 @@ static void stdin_default_event_handler(struct task *t)
  * appeears to be readable, data is read from stdin into the buffer of the
  * stdin task.
  */
-void stdin_post_select(struct sched *s, struct task *t)
+static void stdin_post_select(struct sched *s, struct task *t)
 {
 	struct stdin_task *sit = t->private_data;
 	ssize_t ret;
@@ -75,7 +75,7 @@ void stdin_post_select(struct sched *s, struct task *t)
 	} else
 		t->ret = -E_STDIN_EOF;
 	if (t->ret < 0)
-		sit->eof = 1;
+		sit->error = t->ret;
 }
 
 /**
@@ -92,11 +92,11 @@ void stdin_set_defaults(struct stdin_task *sit)
 {
 	sit->bufsize = 16 * 1024,
 	sit->loaded = 0,
-	sit->eof = 0,
+	sit->error = 0,
 	sit->task.pre_select = stdin_pre_select;
 	sit->task.post_select = stdin_post_select;
 	sit->task.event_handler = stdin_default_event_handler;
 	sit->task.private_data = sit;
-	mark_fd_nonblock(STDIN_FILENO);
+	mark_fd_nonblocking(STDIN_FILENO);
 	sprintf(sit->task.status, "stdin reader");
 }