summaryrefslogtreecommitdiffstats
path: root/src/cgls/cgls.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-02-03 02:05:59 +0100
committerLennart Poettering <lennart@poettering.net>2015-02-03 02:05:59 +0100
commit63c372cb9df3bee01e3bf8cd7f96f336bddda846 (patch)
treebf4d1b6e41f72927a2b58e7dd21daa0c496aaa96 /src/cgls/cgls.c
parentnetworkd: minor simplification (diff)
downloadsystemd-63c372cb9df3bee01e3bf8cd7f96f336bddda846.tar.xz
systemd-63c372cb9df3bee01e3bf8cd7f96f336bddda846.zip
util: rework strappenda(), and rename it strjoina()
After all it is now much more like strjoin() than strappend(). At the same time, add support for NULL sentinels, even if they are normally not necessary.
Diffstat (limited to 'src/cgls/cgls.c')
-rw-r--r--src/cgls/cgls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index f400bccc0a..579e06de5b 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -203,7 +203,7 @@ int main(int argc, char *argv[]) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- m = strappenda("/run/systemd/machines/", arg_machine);
+ m = strjoina("/run/systemd/machines/", arg_machine);
r = parse_env_file(m, NEWLINE, "SCOPE", &scope, NULL);
if (r < 0) {
log_error_errno(r, "Failed to get machine path: %m");