SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: get rid of strappend()

Browse Source 
It's a special case of strjoin(), so no need to keep both. In particular
as typing strjoin() is even shoert than strappend().
This commit is contained in:
Lennart Poettering
2019-07-12 14:31:12 +09:00
committed by Yu Watanabe
parent 6fa0524133
commit b910cc72c0
68 changed files with 115 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/env-util.c
+4 -4
View File
@@ -567,7 +567,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
t = strv_env_get_n(env, word+2, e-word-2, flags);
k = strappend(r, t);
k = strjoin(r, t);
if (!k)
return NULL;
@@ -623,7 +623,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
else if (!t && state == DEFAULT_VALUE)
t = v = replace_env_n(test_value, e-test_value, env, flags);
k = strappend(r, t);
k = strjoin(r, t);
if (!k)
return NULL;
@@ -642,7 +642,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
t = strv_env_get_n(env, word+1, e-word-1, flags);
k = strappend(r, t);
k = strjoin(r, t);
if (!k)
return NULL;
@@ -661,7 +661,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
assert(flags & REPLACE_ENV_ALLOW_BRACELESS);
t = strv_env_get_n(env, word+1, e-word-1, flags);
return strappend(r, t);
return strjoin(r, t);
} else
return strnappend(r, word, e-word);
}