X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=write.c;h=cb32d391eaa0f856414aa23318a7573def0d9eef;hb=HEAD;hp=177b2e66834a03d590f0eba5f1f145c63a703a59;hpb=fdd8a22e1df57a8c9254e7d0074301e7dde2c557;p=paraslash.git

diff --git a/write.c b/write.c
index 177b2e66..cb32d391 100644
--- a/write.c
+++ b/write.c
@@ -54,16 +54,16 @@ struct write_task {
 	struct check_wav_context *cwc;
 };
 
-static void write_pre_select(struct sched *s, void *context)
+static void write_pre_monitor(struct sched *s, void *context)
 {
 	struct write_task *wt = context;
-	check_wav_pre_select(s, wt->cwc);
+	check_wav_pre_monitor(s, wt->cwc);
 }
 
-static int write_post_select(__a_unused struct sched *s, void *context)
+static int write_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct write_task *wt = context;
-	return check_wav_post_select(wt->cwc);
+	return check_wav_post_monitor(wt->cwc);
 }
 
 static int setup_and_schedule(struct lls_parse_result *lpr)
@@ -83,13 +83,13 @@ static int setup_and_schedule(struct lls_parse_result *lpr)
 	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
 	wt.task = task_register(&(struct task_info) {
 		.name = "write",
-		.pre_select = write_pre_select,
-		.post_select = write_post_select,
+		.pre_monitor = write_pre_monitor,
+		.post_monitor = write_post_monitor,
 		.context = &wt,
 	}, &s);
 
 	n = writer_given? writer_given : 1;
-	wns = para_calloc(n * sizeof(*wns));
+	wns = arr_zalloc(n, sizeof(*wns));
 	for (i = 0; i < n; i++) {
 		const char *arg = i < writer_given?
 			lls_string_val(i, OPT_RESULT(WRITER, lpr)) : NULL;
@@ -104,7 +104,7 @@ static int setup_and_schedule(struct lls_parse_result *lpr)
 			struct writer_node *wn = wns + j;
 			ts = task_status(wn->task);
 			assert(ts < 0);
-			if (ts != -E_WRITE_COMMON_EOF && ts != -E_BTR_EOF) {
+			if (ts != -E_EOF) {
 				const char *name = writer_name(wn->wid);
 				PARA_ERROR_LOG("%s: %s\n", name,
 					para_strerror(-ts));