diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-11-03 13:59:20 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-03 13:59:20 -0600 |
commit | 493fd52f1ada36bfe63301d4bb50f7fd2b38c670 (patch) | |
tree | 19864f5568a2fe48181c1b3f33c46b4db36dd768 /src/core/execute.c | |
parent | a1e2ef7ec912902d8142e7cb5830cbfb47dba86c (diff) | |
parent | 9aa2169eaeb20994fb2b0196c051cff52f57a93d (diff) |
Merge pull request #4510 from keszybz/tree-wide-cleanups
Tree wide cleanups
Diffstat (limited to 'src/core/execute.c')
-rw-r--r-- | src/core/execute.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index f13ca30395..5bb23e2e4a 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1603,7 +1603,7 @@ static int build_environment( if (!joined) return -ENOMEM; - x = strjoin("LISTEN_FDNAMES=", joined, NULL); + x = strjoin("LISTEN_FDNAMES=", joined); if (!x) return -ENOMEM; our_env[n_env++] = x; @@ -1710,7 +1710,7 @@ static int build_pass_environment(const ExecContext *c, char ***ret) { v = getenv(*i); if (!v) continue; - x = strjoin(*i, "=", v, NULL); + x = strjoin(*i, "=", v); if (!x) return -ENOMEM; if (!GREEDY_REALLOC(pass_env, n_bufsize, n_env + 2)) @@ -1924,7 +1924,7 @@ static int setup_runtime_directory( STRV_FOREACH(rt, context->runtime_directory) { _cleanup_free_ char *p; - p = strjoin(params->runtime_prefix, "/", *rt, NULL); + p = strjoin(params->runtime_prefix, "/", *rt); if (!p) return -ENOMEM; @@ -2000,7 +2000,7 @@ static int compile_read_write_paths( STRV_FOREACH(rt, context->runtime_directory) { char *s; - s = strjoin(params->runtime_prefix, "/", *rt, NULL); + s = strjoin(params->runtime_prefix, "/", *rt); if (!s) return -ENOMEM; @@ -3004,7 +3004,7 @@ int exec_context_destroy_runtime_directory(ExecContext *c, const char *runtime_p STRV_FOREACH(i, c->runtime_directory) { _cleanup_free_ char *p; - p = strjoin(runtime_prefix, "/", *i, NULL); + p = strjoin(runtime_prefix, "/", *i); if (!p) return -ENOMEM; |