X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=32f6c3abdffdee58f8c4b49087c01b66c3909c1b;hp=458c7f3e6fab40f72d66b1c7cbc790ddb0d4131f;hb=9eaa22ecdafa718fc2a84a70d442c829ae7e1b34;hpb=1cefe6a503c74d609db4e99e689d46575a5e40fd

diff --git a/file_write.c b/file_write.c
index 458c7f3e..32f6c3ab 100644
--- a/file_write.c
+++ b/file_write.c
@@ -129,22 +129,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 */
@@ -152,16 +152,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);
 }