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 07:31:12 +0200 |
| commit | b910cc72c0fb56d96bf98704450fba1f339d8527 (patch) | |
| tree | c36280c1d426b1ec859ecb55872314d6a9855f35 /src/shared/path-lookup.c | |
| parent | Merge pull request #12971 from yuwata/network-reassign-static-routes (diff) | |
| download | systemd-b910cc72c0fb56d96bf98704450fba1f339d8527.tar.xz systemd-b910cc72c0fb56d96bf98704450fba1f339d8527.zip | |
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/path-lookup.c')
| -rw-r--r-- | src/shared/path-lookup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index 6494210ee9..f1caddb477 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -32,7 +32,7 @@ int xdg_user_runtime_dir(char **ret, const char *suffix) { if (!e) return -ENXIO; - j = strappend(e, suffix); + j = strjoin(e, suffix); if (!j) return -ENOMEM; @@ -49,7 +49,7 @@ int xdg_user_config_dir(char **ret, const char *suffix) { e = getenv("XDG_CONFIG_HOME"); if (e) - j = strappend(e, suffix); + j = strjoin(e, suffix); else { _cleanup_free_ char *home = NULL; @@ -81,7 +81,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { e = getenv("XDG_DATA_HOME"); if (e) - j = strappend(e, suffix); + j = strjoin(e, suffix); else { _cleanup_free_ char *home = NULL; @@ -270,15 +270,15 @@ static int acquire_generator_dirs( prefix = strjoina(e, "/systemd"); } - x = strappend(prefix, "/generator"); + x = path_join(prefix, "generator"); if (!x) return -ENOMEM; - y = strappend(prefix, "/generator.early"); + y = path_join(prefix, "generator.early"); if (!y) return -ENOMEM; - z = strappend(prefix, "/generator.late"); + z = path_join(prefix, "generator.late"); if (!z) return -ENOMEM; |