/*
- * 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.
*/
out:
t->error = ret;
if (ret < 0)
- btr_remove_node(btrn);
+ btr_remove_node(&cwt->btrn);
}
static int loglevel;
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);
}
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;
}