From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 1 Aug 2017 08:53:46 +0000 (+0200)
Subject: core: manager_set_exec_params() cannot fail, hence make it void
X-Git-Tag: v235~237^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19bbdd985ec517926177b677b6f6cee31e0a8ab8;p=thirdparty%2Fsystemd.git

core: manager_set_exec_params() cannot fail, hence make it void

Let's simplify things a bit.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 91cb3ab43f7..4d215d5692a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3413,7 +3413,7 @@ Set *manager_get_units_requiring_mounts_for(Manager *m, const char *path) {
         return hashmap_get(m->units_requiring_mounts_for, streq(p, "/") ? "" : p);
 }
 
-int manager_set_exec_params(Manager *m, ExecParameters *p) {
+void manager_set_exec_params(Manager *m, ExecParameters *p) {
         assert(m);
         assert(p);
 
@@ -3423,8 +3423,6 @@ int manager_set_exec_params(Manager *m, ExecParameters *p) {
         p->prefix = m->prefix;
 
         SET_FLAG(p->flags, EXEC_PASS_LOG_UNIT|EXEC_CHOWN_DIRECTORIES, MANAGER_IS_SYSTEM(m));
-
-        return 0;
 }
 
 int manager_update_failed_units(Manager *m, Unit *u, bool failed) {
diff --git a/src/core/manager.h b/src/core/manager.h
index 5146a795f1d..8d621da4e1b 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -384,7 +384,7 @@ void manager_flip_auto_status(Manager *m, bool enable);
 
 Set *manager_get_units_requiring_mounts_for(Manager *m, const char *path);
 
-int manager_set_exec_params(Manager *m, ExecParameters *p);
+void manager_set_exec_params(Manager *m, ExecParameters *p);
 
 ManagerState manager_state(Manager *m);
 
diff --git a/src/core/mount.c b/src/core/mount.c
index 0114efb6487..6b045939d62 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -770,9 +770,7 @@ static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
         if (r < 0)
                 return r;
 
-        r = manager_set_exec_params(UNIT(m)->manager, &exec_params);
-        if (r < 0)
-                return r;
+        manager_set_exec_params(UNIT(m)->manager, &exec_params);
 
         exec_params.cgroup_path = UNIT(m)->cgroup_path;
         SET_FLAG(exec_params.flags, EXEC_CGROUP_DELEGATE, m->cgroup_context.delegate);
diff --git a/src/core/service.c b/src/core/service.c
index c35a41bbe0a..a97ebb1642a 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1344,9 +1344,7 @@ static int service_spawn(
                 }
         }
 
-        r = manager_set_exec_params(UNIT(s)->manager, &exec_params);
-        if (r < 0)
-                return r;
+        manager_set_exec_params(UNIT(s)->manager, &exec_params);
 
         final_env = strv_env_merge(2, exec_params.environment, our_env, NULL);
         if (!final_env)
diff --git a/src/core/socket.c b/src/core/socket.c
index 871f09825cd..078c20fc91b 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1790,9 +1790,7 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
         if (r < 0)
                 return r;
 
-        r = manager_set_exec_params(UNIT(s)->manager, &exec_params);
-        if (r < 0)
-                return r;
+        manager_set_exec_params(UNIT(s)->manager, &exec_params);
 
         exec_params.argv = c->argv;
         exec_params.cgroup_path = UNIT(s)->cgroup_path;
diff --git a/src/core/swap.c b/src/core/swap.c
index 7bea2e8505c..255076839a5 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -636,9 +636,7 @@ static int swap_spawn(Swap *s, ExecCommand *c, pid_t *_pid) {
         if (r < 0)
                 goto fail;
 
-        r = manager_set_exec_params(UNIT(s)->manager, &exec_params);
-        if (r < 0)
-                goto fail;
+        manager_set_exec_params(UNIT(s)->manager, &exec_params);
 
         exec_params.cgroup_path = UNIT(s)->cgroup_path;
         SET_FLAG(exec_params.flags, EXEC_CGROUP_DELEGATE, s->cgroup_context.delegate);