X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=df9608a8c6a2bbb9b3787df76ce8ec7931604e16;hp=b82b3968baf214f3889cca805306438073e21ac6;hb=481150224edabeee0a6bbfdab232df58e5c1224e;hpb=c773ec0d537d239e2eebe2d77a786f0ba49fdc22

diff --git a/oss_write.c b/oss_write.c
index b82b3968..df9608a8 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -52,19 +52,20 @@ static void oss_pre_select(struct sched *s, struct task *t)
 	struct private_oss_write_data *powd = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
-	t->error = 0;
-	if (ret < 0)
-		sched_min_delay(s);
-	else if (ret > 0)
-		para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
+	if (ret == 0)
+		return;
+	if (ret < 0 || !powd)
+		return sched_min_delay(s);
+	para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
 }
 
 static void oss_close(struct writer_node *wn)
 {
 	struct private_oss_write_data *powd = wn->private_data;
 
-	if (powd->fd >= 0)
-		close(powd->fd);
+	if (!powd)
+		return;
+	close(powd->fd);
 	free(powd);
 }
 
@@ -85,12 +86,13 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 	int ret, format;
 	unsigned ch, rate;
 	struct oss_write_args_info *conf = wn->conf;
-	struct private_oss_write_data *powd = wn->private_data;
+	struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
 
+	wn->private_data = powd;
 	PARA_INFO_LOG("opening %s\n", conf->device_arg);
 	ret = para_open(conf->device_arg, O_WRONLY, 0);
 	if (ret < 0)
-		return ret;
+		goto err_free;
 	powd->fd = ret;
 	ret = mark_fd_nonblocking(powd->fd);
 	if (ret < 0)
@@ -150,7 +152,8 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 	return 1;
 err:
 	close(powd->fd);
-	powd->fd = -1;
+err_free:
+	free(powd);
 	return ret;
 }
 
@@ -168,7 +171,7 @@ static void oss_post_select(__a_unused struct sched *s,
 		goto out;
 	if (ret == 0)
 		return;
-	if (powd->fd < 0) {
+	if (!powd) {
 		int32_t rate, ch, format;
 		get_btr_sample_rate(btrn, &rate);
 		get_btr_channels(btrn, &ch);
@@ -199,28 +202,13 @@ out:
 		btr_remove_node(btrn);
 }
 
-static int oss_open(struct writer_node *wn)
-{
-	struct private_oss_write_data *powd;
-
-	powd = para_calloc(sizeof(*powd));
-	wn->private_data = powd;
-	powd->fd = -1;
-	return 1;
-}
-
-__malloc static void *oss_parse_config(const char *options)
+__malloc static void *oss_parse_config_or_die(const char *options)
 {
-	int ret;
 	struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
 
-	ret = oss_cmdline_parser_string(options, conf, "oss_write");
-	if (ret)
-		goto err_out;
+	/* exits on errors */
+	oss_cmdline_parser_string(options, conf, "oss_write");
 	return conf;
-err_out:
-	free(conf);
-	return NULL;
 }
 
 static void oss_free_config(void *conf)
@@ -240,11 +228,10 @@ void oss_write_init(struct writer *w)
 	struct oss_write_args_info dummy;
 
 	oss_cmdline_parser_init(&dummy);
-	w->open = oss_open;
 	w->close = oss_close;
 	w->pre_select = oss_pre_select;
 	w->post_select = oss_post_select;
-	w->parse_config = oss_parse_config;
+	w->parse_config_or_die = oss_parse_config_or_die;
 	w->free_config = oss_free_config;
 	w->shutdown = NULL;
 	w->help = (struct ggo_help) {