summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-10 20:42:58 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-10 21:03:49 +0100
commit9ff1a6f1d61d4569920d5b75c88cf1c2ad9adaae (patch)
treee96308b84a66e5d1bebac24ac5d98c8bcd627692
parent5a6158b6412100672e1cbddb22efdcc5101fed7f (diff)
core: change type of distribute_fds() prototype to return void
We can't handle errors of thisc all sanely anyway, and we never actually return any errors from the unit type that implements the call. Hence, let's make this void, in order to simplify things.
-rw-r--r--src/core/manager.c22
-rw-r--r--src/core/socket.c4
-rw-r--r--src/core/unit.h2
3 files changed, 9 insertions, 19 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index dbe11c2b4d..f712ac29dc 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1094,10 +1094,9 @@ fail:
}
-static int manager_distribute_fds(Manager *m, FDSet *fds) {
- Unit *u;
+static void manager_distribute_fds(Manager *m, FDSet *fds) {
Iterator i;
- int r;
+ Unit *u;
assert(m);
@@ -1106,14 +1105,11 @@ static int manager_distribute_fds(Manager *m, FDSet *fds) {
if (fdset_size(fds) <= 0)
break;
- if (UNIT_VTABLE(u)->distribute_fds) {
- r = UNIT_VTABLE(u)->distribute_fds(u, fds);
- if (r < 0)
- return r;
- }
- }
+ if (!UNIT_VTABLE(u)->distribute_fds)
+ continue;
- return 0;
+ UNIT_VTABLE(u)->distribute_fds(u, fds);
+ }
}
int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
@@ -1157,11 +1153,7 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
* useful to allow container managers to pass some file
* descriptors to us pre-initialized. This enables
* socket-based activation of entire containers. */
- if (fdset_size(fds) > 0) {
- q = manager_distribute_fds(m, fds);
- if (q < 0 && r == 0)
- r = q;
- }
+ manager_distribute_fds(m, fds);
/* We might have deserialized the notify fd, but if we didn't
* then let's create the bus now */
diff --git a/src/core/socket.c b/src/core/socket.c
index 3c7f972fbc..c73ee78b13 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2332,7 +2332,7 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
return 0;
}
-static int socket_distribute_fds(Unit *u, FDSet *fds) {
+static void socket_distribute_fds(Unit *u, FDSet *fds) {
Socket *s = SOCKET(u);
SocketPort *p;
@@ -2356,8 +2356,6 @@ static int socket_distribute_fds(Unit *u, FDSet *fds) {
}
}
}
-
- return 0;
}
_pure_ static UnitActiveState socket_active_state(Unit *u) {
diff --git a/src/core/unit.h b/src/core/unit.h
index eb2af229b5..03d7d8de7f 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -322,7 +322,7 @@ struct UnitVTable {
int (*deserialize_item)(Unit *u, const char *key, const char *data, FDSet *fds);
/* Try to match up fds with what we need for this unit */
- int (*distribute_fds)(Unit *u, FDSet *fds);
+ void (*distribute_fds)(Unit *u, FDSet *fds);
/* Boils down the more complex internal state of this unit to
* a simpler one that the engine can understand */