X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=4d06e8048a5351abe2c62bd669e01e3228eb76cb;hp=9577f0406b8cf1f0968300591a75e44bec6be75f;hb=909fb4c74895fc84684c572ff8d4f76ada9ef355;hpb=d0f36435b0f81368a778fda33f3a7df86830f5ac

diff --git a/write.c b/write.c
index 9577f040..4d06e804 100644
--- a/write.c
+++ b/write.c
@@ -194,7 +194,7 @@ out:
 	}
 err:
 	if (t->error < 0)
-		btr_del_node(cwt->btrn);
+		btr_remove_node(cwt->btrn);
 }
 
 static void initial_delay_pre_select(struct sched *s, struct task *t)
@@ -284,6 +284,7 @@ static int main_btr(struct sched *s)
 	struct check_wav_task_btr _cwt, *cwt = &_cwt;
 	struct writer_node **wns;
 
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	sit.btrn = btr_new_node("stdin", NULL /* stdin has no parent */, NULL, NULL);
 	stdin_set_defaults(&sit);
 	register_task(&sit.task);
@@ -296,8 +297,6 @@ static int main_btr(struct sched *s)
 	cwt->task.error = 0;
 	register_task(&cwt->task);
 
-	PARA_CRIT_LOG("writers:\n");
-
 	ret = -E_WRITE_SYNTAX;
 	if (!conf.writer_given) {
 		i = 0;
@@ -309,7 +308,6 @@ static int main_btr(struct sched *s)
 	} else {
 		wns = para_malloc(conf.writer_given * sizeof(*wns));
 		for (i = 0; i < conf.writer_given; i++) {
-			PARA_CRIT_LOG("i: %d\n", i);
 			wns[i] = setup_writer_node(conf.writer_arg[i],
 				cwt->btrn);
 			if (!wns[i])
@@ -326,11 +324,12 @@ out:
 		struct writer *w = writers + wn->writer_num;
 
 		w->close(wn);
-		btr_del_node(wn->btrn);
+		btr_free_node(wn->btrn);
 		free(wn->conf);
 		free(wn);
 	}
 	free(wns);
+	btr_free_node(cwt->btrn);
 	return ret;
 }