X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=32f6c3abdffdee58f8c4b49087c01b66c3909c1b;hp=5c5c5149ab4d27f7f8853df6a47833948da30f74;hb=35e284e06a5c8e20d02b61fdcb4bcc20b237c1e4;hpb=c4bfb18b78b3935b8dbf68f70b219cfb2a192979 diff --git a/file_write.c b/file_write.c index 5c5c5149..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,7 +152,7 @@ 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; @@ -162,5 +162,5 @@ void file_write_init(struct writer *w) .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); }