write: Get rid of gengetopt's string parser.

[paraslash.git] / file_write.c

diff --git a/file_write.c b/file_write.c
index 8cafbb687b8498ff6b9db43a1129676363b3db20..9817571570e0dac6975a983845ff545523781325 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 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"
@@ -131,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;
 }
 
@@ -160,7 +158,6 @@ void file_write_init(struct writer *w)
        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