X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=d2dc963eaeb03f3b5cc520248109cef0cac6b08b;hp=f075ce502900e03e3fb743229e9f6ca7c735725e;hb=1af65c31171b35e5a5e931e3a4467786e932e145;hpb=26a0b7e457d1dd7e0e40d866d28de00c5d1cfa54

diff --git a/oss_write.c b/oss_write.c
index f075ce50..d2dc963e 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -152,6 +152,8 @@ err:
 	close(powd->fd);
 err_free:
 	free(powd);
+	PARA_ERROR_LOG("failed to init %s: %s\n", conf->device_arg,
+		para_strerror(-ret));
 	return ret;
 }
 
@@ -197,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);
 }
 
 /**
@@ -225,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);
 }