X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=3b5f2d193f31ddc1d8c130703637810f807f255f;hp=3d1b093264bf3e88602b4dc146929582c5b896ed;hb=c0abcee0da53a6b399c3d16a62830aaa9ae21349;hpb=b4ed16eddb2433f002139ad1e133427b77814d43

diff --git a/write.c b/write.c
index 3d1b0932..3b5f2d19 100644
--- a/write.c
+++ b/write.c
@@ -185,19 +185,16 @@ __noreturn static void print_help_and_die(void)
  *
  * \return Standard.
  */
-static int setup_writer_node(const char *arg, struct btr_node *parent,
+static void setup_writer_node(const char *arg, struct btr_node *parent,
 		struct writer_node *wn)
 {
 	if (arg)
-		wn->conf = check_writer_arg(arg, &wn->writer_num);
+		wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
 	else {
 		wn->writer_num = DEFAULT_WRITER;
 		wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
 	}
-	if (!wn->conf)
-		return -E_WRITE_COMMON_SYNTAX;
 	register_writer_node(wn, parent);
-	return 1;
 }
 
 static int setup_and_schedule(void)
@@ -224,22 +221,15 @@ static int setup_and_schedule(void)
 	cwt->task.error = 0;
 	register_task(&cwt->task);
 
-	ret = -E_WRITE_SYNTAX;
 	if (!conf.writer_given) {
-		i = 0;
 		wns = para_calloc(sizeof(*wns));
-		ret = setup_writer_node(NULL, cwt->btrn, wns);
-		if (ret < 0)
-			goto out;
+		setup_writer_node(NULL, cwt->btrn, wns);
 		i = 1;
 	} else {
 		wns = para_calloc(conf.writer_given * sizeof(*wns));
-		for (i = 0; i < conf.writer_given; i++) {
-			ret = setup_writer_node(conf.writer_arg[i],
-				cwt->btrn, wns + i);
-			if (ret < 0)
-				goto out;
-		}
+		for (i = 0; i < conf.writer_given; i++)
+			setup_writer_node(conf.writer_arg[i], cwt->btrn,
+				wns + i);
 	}
 
 	s.default_timeout.tv_sec = 10;
@@ -259,7 +249,6 @@ static int setup_and_schedule(void)
 			}
 		}
 	}
-out:
 	for (i--; i >= 0; i--) {
 		struct writer_node *wn = wns + i;
 		struct writer *w = writers + wn->writer_num;
@@ -287,7 +276,7 @@ out:
  */
 int main(int argc, char *argv[])
 {
-	int ret = -E_WRITE_SYNTAX;
+	int ret;
 
 	writer_init();
 	write_cmdline_parser(argc, argv, &conf);