X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=b3f103e97d4ae1c5e1f84c6fe2de8bb1bac70df3;hp=0dc233fca0a1b77859462959edfbb33c7d826902;hb=121015ff5cdbe6af7b84f6245ebe62fe2a52a859;hpb=9e1f7d426afe9cc1c3556ff167733b64a46b4090

diff --git a/write.c b/write.c
index 0dc233fc..b3f103e9 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -75,15 +75,15 @@ struct write_task {
 	struct check_wav_context *cwc;
 };
 
-static void write_pre_select(struct sched *s, struct task *t)
+static void write_pre_select(struct sched *s, void *context)
 {
-	struct write_task *wt = task_context(t);
+	struct write_task *wt = context;
 	check_wav_pre_select(s, wt->cwc);
 }
 
-static int write_post_select(__a_unused struct sched *s, struct task *t)
+static int write_post_select(__a_unused struct sched *s, void *context)
 {
-	struct write_task *wt = task_context(t);
+	struct write_task *wt = context;
 	return check_wav_post_select(wt->cwc);
 }
 
@@ -123,16 +123,17 @@ static int setup_and_schedule(void)
 	s.default_timeout.tv_usec = 50000;
 	ret = schedule(&s);
 	if (ret >= 0) {
-		int j;
+		int j, ts;
 		for (j = 0; j < i; j++) {
-			struct task *t = &wns[j].task;
-			assert(t->error < 0);
-			if (t->error != -E_WRITE_COMMON_EOF
-					&& t->error != -E_BTR_EOF) {
-				PARA_ERROR_LOG("%s: %s\n", t->status,
-					para_strerror(-t->error));
+			struct writer_node *wn = wns + j;
+			ts = task_status(wn->task);
+			assert(ts < 0);
+			if (ts != -E_WRITE_COMMON_EOF && ts != -E_BTR_EOF) {
+				const char *name = writer_names[wn->writer_num];
+				PARA_ERROR_LOG("%s: %s\n", name,
+					para_strerror(-ts));
 				if (ret >= 0)
-					ret = t->error;
+					ret = ts;
 			}
 		}
 	}