string: Clean up for_each_line() and related functions.

[paraslash.git] / file_write.c

diff --git a/file_write.c b/file_write.c
index 149b48efcc38afe4b3f72aca2eecc6b5364001cc..a12867d5d24830e0b9b2050aff957a42eff3cbf0 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 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;
@@ -116,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;
@@ -135,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 */
@@ -158,17 +154,15 @@ void file_write_init(struct writer *w)
 {
        struct file_write_args_info dummy;
 
-       file_cmdline_parser_init(&dummy);
-       w->open = file_write_open;
+       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);
 }