Add implicit sentinel to strv_env_merge()

Just to make it a tiny bit nicer to use.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-08-11 09:11:42 +02:00
parent d340bdd1bd
commit 4ab3d29ff0
11 changed files with 50 additions and 38 deletions
+1 -1
View File
@@ -1526,7 +1526,7 @@ static int start_transient_scope(sd_bus *bus) {
return log_error_errno(errno, "Failed to change UID to " UID_FMT ": %m", uid);
}
env = strv_env_merge(3, environ, user_env, arg_environment);
env = strv_env_merge(environ, user_env, arg_environment);
if (!env)
return log_oom();