summaryrefslogtreecommitdiff
path: root/src/shared/path-lookup.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-07-11 19:14:16 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-07-12 14:31:12 +0900
commitb910cc72c0fb56d96bf98704450fba1f339d8527 (patch)
treec36280c1d426b1ec859ecb55872314d6a9855f35 /src/shared/path-lookup.c
parent6fa0524133ce54889f870d7ad17ab1d1832d7460 (diff)
downloadsystemd-b910cc72c0fb56d96bf98704450fba1f339d8527.tar.gz
systemd-b910cc72c0fb56d96bf98704450fba1f339d8527.tar.bz2
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.c12
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;