X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=a3cd4b5d640b5467ce762f8d4e2fb12450c0dc7a;hp=5bcd1f60aa4c430ef1ae35561ffcb40df25cce26;hb=899a19c03fc05f6fd98687e3eaa86841a4633a10;hpb=39ef1da5509461b18beb5b8f16ff6118c20c0ac6

diff --git a/write.c b/write.c
index 5bcd1f60..a3cd4b5d 100644
--- a/write.c
+++ b/write.c
@@ -150,9 +150,8 @@ static struct writer_node_group *check_args(void)
 	}
 	ret = 1;
 out:
-	if (ret > 0) {
+	if (ret > 0)
 		return wng;
-	}
 	free(wng);
 	return NULL;
 }
@@ -165,8 +164,7 @@ static void idt_event_handler(struct task *t)
 	unregister_task(t);
 	wng->buf = sit.buf;
 	wng->loaded = &sit.loaded;
-	wng->eof = &sit.eof;
-	sprintf(wng->task.status, "%s", "writer node group");
+	wng->input_eof = &sit.eof;
 	ret = wng_open(wng);
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
@@ -193,15 +191,6 @@ static void cwt_event_handler(struct task *t)
 	register_task(&idt.task);
 }
 
-static void stdin_event_handler(struct task *t)
-{
-	unregister_task(t);
-	if (t->ret != -E_STDIN_EOF)
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-	else
-		PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
-}
-
 int main(int argc, char *argv[])
 {
 	int ret = -E_WRITE_SYNTAX;
@@ -214,14 +203,8 @@ int main(int argc, char *argv[])
 	init_supported_writers();
 	init_sched();
 
-	sit.bufsize = 16 * 1024,
-	sit.buf = para_malloc(16 * 1024),
-	sit.loaded = 0,
-	sit.task.pre_select = stdin_pre_select;
-	sit.task.post_select = stdin_post_select;
-	sit.task.event_handler = stdin_event_handler;
-	sit.task.private_data = &sit;
-	sprintf(sit.task.status, "stdin reader");
+	stdin_set_defaults(&sit);
+	sit.buf = para_malloc(sit.bufsize),
 	register_task(&sit.task);
 
 	cwt.task.pre_select = check_wav_pre_select;