X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=d2dc963eaeb03f3b5cc520248109cef0cac6b08b;hp=f1e901993120008eb67a221c438b1b3f5c3a3c10;hb=35e284e06a5c8e20d02b61fdcb4bcc20b237c1e4;hpb=52071c963c318f979fd1ba37ba4dc4523c65d428

diff --git a/oss_write.c b/oss_write.c
index f1e90199..d2dc963e 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -199,21 +199,21 @@ static void oss_post_select(__a_unused struct sched *s,
 out:
 	t->error = ret;
 	if (ret < 0)
-		btr_remove_node(btrn);
+		btr_remove_node(&wn->btrn);
 }
 
-__malloc static void *oss_parse_config_or_die(const char *options)
+__malloc static void *oss_parse_config_or_die(int argc, char **argv)
 {
 	struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	/* exits on errors */
-	oss_cmdline_parser_string(options, conf, "oss_write");
+	oss_write_cmdline_parser(argc, argv, conf);
 	return conf;
 }
 
 static void oss_free_config(void *conf)
 {
-	oss_cmdline_parser_free(conf);
+	oss_write_cmdline_parser_free(conf);
 }
 
 /**
@@ -227,16 +227,15 @@ void oss_write_init(struct writer *w)
 {
 	struct oss_write_args_info dummy;
 
-	oss_cmdline_parser_init(&dummy);
+	oss_write_cmdline_parser_init(&dummy);
 	w->close = oss_close;
 	w->pre_select = oss_pre_select;
 	w->post_select = oss_post_select;
 	w->parse_config_or_die = oss_parse_config_or_die;
 	w->free_config = oss_free_config;
-	w->shutdown = NULL;
 	w->help = (struct ggo_help) {
 		.short_help = oss_write_args_info_help,
 		.detailed_help = oss_write_args_info_detailed_help
 	};
-	oss_cmdline_parser_free(&dummy);
+	oss_write_cmdline_parser_free(&dummy);
 }