X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=df37d7ec5ce6efcae37cdf8cdb9de49c94ee5898;hp=946653f62dfa140d9930f74cc3350262b66ba542;hb=8fa50e3e39b4f65dea2a694dc064038a41036642;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953

diff --git a/write.c b/write.c
index 946653f6..df37d7ec 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -143,7 +143,7 @@ pushdown:
 out:
 	t->error = ret;
 	if (ret < 0)
-		btr_remove_node(btrn);
+		btr_remove_node(&cwt->btrn);
 }
 
 static int loglevel;
@@ -187,12 +187,7 @@ __noreturn static void print_help_and_die(void)
 static void setup_writer_node(const char *arg, struct btr_node *parent,
 		struct writer_node *wn, struct sched *s)
 {
-	if (arg)
-		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("");
-	}
+	wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
 	register_writer_node(wn, parent, s);
 }
 
@@ -253,12 +248,12 @@ static int setup_and_schedule(void)
 		struct writer *w = writers + wn->writer_num;
 
 		w->close(wn);
-		btr_free_node(wn->btrn);
+		btr_remove_node(&wn->btrn);
 		w->free_config(wn->conf);
 		free(wn->conf);
 	}
 	free(wns);
-	btr_free_node(cwt->btrn);
+	btr_remove_node(&cwt->btrn);
 	return ret;
 }