X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=c78df5b83bab6e0685eda33274c68a2f8f3f454f;hp=5af79b04f4af5d2378ac1d0ccb9d76a7a4f48fe9;hb=eb992f2fc3ff5b6bd1c0b91d473b07675fe5b927;hpb=af20b849aa8b081bd20c47bda4874d6ea6ee9365

diff --git a/audiod.c b/audiod.c
index 5af79b04..c78df5b8 100644
--- a/audiod.c
+++ b/audiod.c
@@ -776,16 +776,13 @@ static int parse_writer_args(void)
 
 		ret = parse_stream_command(conf.writer_arg[i], &cmd);
 		if (ret < 0)
-			goto out;
+			return ret;
 		af_mask = ret;
 		FOR_EACH_AUDIO_FORMAT(j) {
 			a = afi + j;
 			if ((af_mask & (1 << j)) == 0) /* no match */
 				continue;
-			ret = -E_WRITE_COMMON_SYNTAX;
-			wconf = check_writer_arg(cmd, &writer_num);
-			if (!wconf)
-				goto out;
+			wconf = check_writer_arg_or_die(cmd, &writer_num);
 			nw = a->num_writers;
 			a->writer_nums = para_realloc(a->writer_nums, (nw + 1) * sizeof(int));
 			a->writer_conf = para_realloc(a->writer_conf, (nw + 1) * sizeof(void *));
@@ -810,9 +807,7 @@ static int parse_writer_args(void)
 		a->writer_conf[0] = w->parse_config_or_die("");
 		a->num_writers = 1;
 	}
-	ret = 1;
-out:
-	return ret;
+	return 1;
 }
 
 static int parse_receiver_args(void)