diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-07-11 19:14:16 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-12 14:31:12 +0900 |
| commit | b910cc72c0fb56d96bf98704450fba1f339d8527 (patch) | |
| tree | c36280c1d426b1ec859ecb55872314d6a9855f35 /src/shared/machine-image.c | |
| parent | 6fa0524133ce54889f870d7ad17ab1d1832d7460 (diff) | |
| download | systemd-b910cc72c0fb56d96bf98704450fba1f339d8527.tar.gz | |
tree-wide: get rid of strappend()
It's a special case of strjoin(), so no need to keep both. In particular
as typing strjoin() is even shoert than strappend().
Diffstat (limited to 'src/shared/machine-image.c')
| -rw-r--r-- | src/shared/machine-image.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c index ee086e35b4..07744b34b4 100644 --- a/src/shared/machine-image.c +++ b/src/shared/machine-image.c @@ -87,8 +87,8 @@ static char **image_settings_path(Image *image) { fn = strjoina(image->name, ".nspawn"); - FOREACH_STRING(s, "/etc/systemd/nspawn/", "/run/systemd/nspawn/") { - l[i] = strappend(s, fn); + FOREACH_STRING(s, "/etc/systemd/nspawn", "/run/systemd/nspawn") { + l[i] = path_join(s, fn); if (!l[i]) return NULL; @@ -441,7 +441,7 @@ int image_find(ImageClass class, const char *name, Image **ret) { if (errno != ENOENT) return -errno; - raw = strappend(name, ".raw"); + raw = strjoin(name, ".raw"); if (!raw) return -ENOMEM; |