Add implicit sentinel to strv_env_merge()

Just to make it a tiny bit nicer to use.
2021-08-11 09:11:42 +02:00
parent d340bdd1bd
commit 4ab3d29ff0
11 changed files with 50 additions and 38 deletions
@@ -4158,8 +4158,7 @@ static int exec_child(
                return log_oom();
        }

-        accum_env = strv_env_merge(5,
-                                   params->environment,
+        accum_env = strv_env_merge(params->environment,
                                   our_env,
                                   pass_env,
                                   context->environment,
@@ -5214,7 +5213,7 @@ static int exec_context_load_environment(const Unit *unit, const ExecContext *c,
                        else {
                                char **m;

-                                m = strv_env_merge(2, r, p);
+                                m = strv_env_merge(r, p);
                                strv_free(r);
                                strv_free(p);
                                if (!m)