X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=write_common.c;h=4619d40702338901d3437a4989afaf54889e334d;hb=f87868b3147b189b6d4ee4e44817f092bd1c2895;hp=4e81f62d68df57b04617a9e441f244c41cc3ed56;hpb=4213f76d961629c7996c9d8c95171197f963e2f4;p=paraslash.git

diff --git a/write_common.c b/write_common.c
index 4e81f62d..4619d407 100644
--- a/write_common.c
+++ b/write_common.c
@@ -27,6 +27,8 @@ static void wng_pre_select(__a_unused struct sched *s, struct task *t)
 
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
+		if (!wn->writer->pre_select)
+			continue;
 		t->error = wn->writer->pre_select(s, wn);
 		if (t->error < 0)
 			return;
@@ -61,7 +63,7 @@ static void wng_post_select(struct sched *s, struct task *t)
 	}
 	if (*g->loaded && min_written) {
 //		PARA_INFO_LOG("moving %zd bytes\n", *g->loaded);
-		memmove(g->buf, g->buf + min_written, *g->loaded);
+		memmove(*g->bufp, *g->bufp + min_written, *g->loaded);
 	}
 }
 
@@ -97,7 +99,9 @@ err_out:
 		struct writer_node *wn = &g->writer_nodes[--i];
 		wn->writer->close(wn);
 	}
+	free(g->writer_nodes);
 	g->num_writers = 0;
+	g->task.error = -E_TASK_UNREGISTERED;
 	return ret;
 }