diff options
author | Ronny Chevalier <chevalier.ronny@gmail.com> | 2015-04-10 16:53:17 +0200 |
---|---|---|
committer | Ronny Chevalier <chevalier.ronny@gmail.com> | 2015-04-10 17:13:15 +0200 |
commit | 756c09e672a08efd9e728a5cab50a641b022b84c (patch) | |
tree | 5361b58f9b8d79b671ba496c0d95f2f7713a4076 /src/core/unit.c | |
parent | 17493fa5d17cadce3b773692d3eeab137de7d323 (diff) |
core: set_put never returns -EEXIST
When the value is already there it returns 0.
Also add a test to ensure this
Diffstat (limited to 'src/core/unit.c')
-rw-r--r-- | src/core/unit.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index f9aca0188c..7660d6b367 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -181,12 +181,8 @@ int unit_add_name(Unit *u, const char *text) { return -E2BIG; r = set_put(u->names, s); - if (r < 0) { - if (r == -EEXIST) - return 0; - + if (r <= 0) return r; - } r = hashmap_put(u->manager->units, s, u); if (r < 0) { @@ -1161,7 +1157,6 @@ static int unit_add_mount_dependencies(Unit *u) { static int unit_add_startup_units(Unit *u) { CGroupContext *c; - int r = 0; c = unit_get_cgroup_context(u); if (!c) @@ -1171,11 +1166,7 @@ static int unit_add_startup_units(Unit *u) { c->startup_blockio_weight == (unsigned long) -1) return 0; - r = set_put(u->manager->startup_units, u); - if (r == -EEXIST) - return 0; - - return r; + return set_put(u->manager->startup_units, u); } int unit_load(Unit *u) { |