X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=f9560d7f1ee1050439f16459a6fda786647d9250;hp=b35773f7ff7103fe002e8b23e3be7c128afb9cad;hb=78882bd94652b156e55e6385a33cd5126c439651;hpb=51dde9efab2d662cf5813d26d5c9aebce6e197e7

diff --git a/write_common.c b/write_common.c
index b35773f7..f9560d7f 100644
--- a/write_common.c
+++ b/write_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -21,49 +21,43 @@ struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
 static void wng_pre_select(__a_unused struct sched *s, struct task *t)
 {
-	struct writer_node_group *g = t->private_data;
+	struct writer_node_group *g = container_of(t, struct writer_node_group, task);
 	int i;
 
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
-		t->ret = wn->writer->pre_select(s, wn);
-		if (t->ret < 0) {
-			g->eof = 1;
+		t->error = wn->writer->pre_select(s, wn);
+		if (t->error < 0)
 			return;
-		}
 	}
 }
 
 static void wng_post_select(struct sched *s, struct task *t)
 {
-	struct writer_node_group *g = t->private_data;
+	struct writer_node_group *g = container_of(t, struct writer_node_group, task);
 	int i;
 	size_t min_written = 0;
 
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
-		t->ret = wn->writer->post_select(s, wn);
-		if (t->ret < 0) {
-			g->eof = 1;
+		t->error = wn->writer->post_select(s, wn);
+		if (t->error < 0)
 			return;
-		}
 		if (!i)
 			min_written = wn->written;
 		else
 			min_written = PARA_MIN(min_written, wn->written);
 	}
-//	PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
+	//PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
 	if (min_written) {
 		*g->loaded -= min_written;
 		FOR_EACH_WRITER_NODE(i, g)
 			g->writer_nodes[i].written -= min_written;
 	}
-	if (!*g->loaded && *g->input_eof) {
-		g->eof = 1;
-		t->ret = -E_WNG_EOF;
+	if (!*g->loaded && *g->input_error) {
+		t->error = *g->input_error;
 		return;
 	}
-	t->ret = 1;
 	if (*g->loaded && min_written) {
 //		PARA_INFO_LOG("moving %zd bytes\n", *g->loaded);
 		memmove(g->buf, g->buf + min_written, *g->loaded);
@@ -96,17 +90,15 @@ int wng_open(struct writer_node_group *g)
 		g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
 	}
 	sprintf(g->task.status, "%s", "writer node group");
-	g->eof = 0;
 	return 1;
 err_out:
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	unregister_task(&g->task);
 	while (i > 0) {
 		struct writer_node *wn = &g->writer_nodes[--i];
 		wn->writer->close(wn);
 	}
 	g->num_writers = 0;
-	g->eof = 1;
 	return ret;
 }
 
@@ -119,7 +111,6 @@ err_out:
 void wng_unregister(struct writer_node_group *g)
 {
 	unregister_task(&g->task);
-	g->eof = 1;
 }
 
 /**
@@ -157,7 +148,6 @@ struct writer_node_group *wng_new(unsigned num_writers)
 	g->num_writers = num_writers;
 	g->writer_nodes = para_calloc(num_writers
 		* sizeof(struct writer_node));
-	g->task.private_data = g;
 	g->task.post_select = wng_post_select;
 	g->task.pre_select = wng_pre_select;
 	return g;
@@ -210,7 +200,7 @@ void *check_writer_arg(const char *wa, int *writer_num)
 		*writer_num = i;
 		return writers[i].parse_config(c? wa + len + 1 : "");
 	}
-	PARA_ERROR_LOG("%s", "writer not found\n");
+	PARA_ERROR_LOG("writer not found\n");
 	return NULL;
 }