From 8085f163c50d998f3e30a6ddfc72c73d5dc57747 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 11 Mar 2014 10:41:22 -0400 Subject: util: allow strappenda to take any number of args This makes strappenda3 redundant, so we remove its usage and definition. Add a few tests along the way for sanity. --- src/systemctl/systemctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/systemctl') diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 540b4a64c1..36db652316 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4827,7 +4827,7 @@ static int switch_root(sd_bus *bus, char **args) { const char *root_systemd_path = NULL, *root_init_path = NULL; root_systemd_path = strappenda(root, "/" SYSTEMD_BINARY_PATH); - root_init_path = strappenda3(root, "/", init); + root_init_path = strappenda(root, "/", init); /* If the passed init is actually the same as the * systemd binary, then let's suppress it. */ -- cgit v1.2.3-54-g00ecf