X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=file_write.c;h=9817571570e0dac6975a983845ff545523781325;hb=8fa50e3e39b4f65dea2a694dc064038a41036642;hp=149b48efcc38afe4b3f72aca2eecc6b5364001cc;hpb=00837775857a5c40c8c8da8ac509c3e751312ea3;p=paraslash.git

diff --git a/file_write.c b/file_write.c
index 149b48ef..98175715 100644
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,9 +8,7 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -50,10 +48,6 @@ __must_check __malloc static char *random_filename(void)
 	return result;
 }
 
-static void file_write_open(__a_unused struct writer_node *wn)
-{
-}
-
 static int prepare_output_file(struct writer_node *wn)
 {
 	struct file_write_args_info *conf = wn->conf;
@@ -135,16 +129,16 @@ 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_cmdline_parser(argc, argv, conf);
 	return conf;
 }
 
@@ -159,13 +153,11 @@ void file_write_init(struct writer *w)
 	struct file_write_args_info dummy;
 
 	file_cmdline_parser_init(&dummy);
-	w->open = file_write_open;
 	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