X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=a12867d5d24830e0b9b2050aff957a42eff3cbf0;hp=bfade187a8b215ff74fb5baecee845149f360528;hb=23b121a85984baa9252f4b4c0b8c4f186e394bb7;hpb=d7b4aa3835197ee906f13f515040e1cda6385544

diff --git a/file_write.c b/file_write.c
index bfade187..a12867d5 100644
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -111,7 +110,9 @@ static void file_write_post_select(__a_unused struct sched *s,
 	char *buf;
 	size_t bytes;
 
-	t->error = 0;
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
 	if (ret <= 0)
 		goto out;
@@ -130,22 +131,22 @@ static void file_write_post_select(__a_unused struct sched *s,
 	btr_consume(btrn, ret);
 out:
 	if (ret < 0)
-		btr_remove_node(btrn);
+		btr_remove_node(&wn->btrn);
 	t->error = ret;
 }
 
-__malloc static void *file_write_parse_config_or_die(const char *options)
+__malloc static void *file_write_parse_config_or_die(int argc, char **argv)
 {
 	struct file_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	/* exits on errors */
-	file_cmdline_parser_string(options, conf, "file_write");
+	file_write_cmdline_parser(argc, argv, conf);
 	return conf;
 }
 
 static void file_write_free_config(void *conf)
 {
-	file_cmdline_parser_free(conf);
+	file_write_cmdline_parser_free(conf);
 }
 
 /** the init function of the file writer */
@@ -153,16 +154,15 @@ void file_write_init(struct writer *w)
 {
 	struct file_write_args_info dummy;
 
-	file_cmdline_parser_init(&dummy);
+	file_write_cmdline_parser_init(&dummy);
 	w->pre_select = file_write_pre_select;
 	w->post_select = file_write_post_select;
 	w->parse_config_or_die = file_write_parse_config_or_die;
 	w->free_config = file_write_free_config;
 	w->close = file_write_close;
-	w->shutdown = NULL; /* nothing to do */
 	w->help = (struct ggo_help) {
 		.short_help = file_write_args_info_help,
 		.detailed_help = file_write_args_info_detailed_help
 	};
-	file_cmdline_parser_free(&dummy);
+	file_write_cmdline_parser_free(&dummy);
 }