diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-02-03 02:05:59 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-02-03 02:05:59 +0100 |
| commit | 63c372cb9df3bee01e3bf8cd7f96f336bddda846 (patch) | |
| tree | bf4d1b6e41f72927a2b58e7dd21daa0c496aaa96 /src/libsystemd/sd-login/sd-login.c | |
| parent | 44de0efc6e406515fc1cf8b95d9655d0d7f7ffff (diff) | |
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/libsystemd/sd-login/sd-login.c')
| -rw-r--r-- | src/libsystemd/sd-login/sd-login.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c index c72d23ed53..c171405a65 100644 --- a/src/libsystemd/sd-login/sd-login.c +++ b/src/libsystemd/sd-login/sd-login.c @@ -791,7 +791,7 @@ _public_ int sd_machine_get_class(const char *machine, char **class) { assert_return(machine_name_is_valid(machine), -EINVAL); assert_return(class, -EINVAL); - p = strappenda("/run/systemd/machines/", machine); + p = strjoina("/run/systemd/machines/", machine); r = parse_env_file(p, NEWLINE, "CLASS", &c, NULL); if (r < 0) return r; @@ -814,7 +814,7 @@ _public_ int sd_machine_get_ifindices(const char *machine, int **ifindices) { assert_return(machine_name_is_valid(machine), -EINVAL); assert_return(ifindices, -EINVAL); - p = strappenda("/run/systemd/machines/", machine); + p = strjoina("/run/systemd/machines/", machine); r = parse_env_file(p, NEWLINE, "NETIF", &netif, NULL); if (r < 0) return r; |