diff options
| author | Daniel Mack <daniel@zonque.org> | 2016-01-10 18:10:08 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2016-01-10 18:10:08 +0100 |
| commit | 201f0c916d8f65ad2595a651b1371fcd39a4cf55 (patch) | |
| tree | e978af5f2275036d0693b2d627b6ca838d811b01 | |
| parent | cf6c8c46fceac83dfb3f2d55fae5220e60841553 (diff) | |
tree-wide: unify argument lists of IN_SET()
The new implementation will not allow passing the same values more than
once, so clean up first.
| -rw-r--r-- | src/core/unit.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-link.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index f935b6a601..b977ac7f0c 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3119,7 +3119,7 @@ int unit_kill_common( killed = true; } - if (r == 0 && !killed && IN_SET(who, KILL_ALL_FAIL, KILL_CONTROL_FAIL, KILL_ALL_FAIL)) + if (r == 0 && !killed && IN_SET(who, KILL_ALL_FAIL, KILL_CONTROL_FAIL)) return -ESRCH; return r; diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 4a807bacc3..10fec5e75f 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2495,7 +2495,7 @@ int link_ipv6ll_gained(Link *link, const struct in6_addr *address) { link->ipv6ll_address = *address; link_check_ready(link); - if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_PENDING, LINK_STATE_UNMANAGED, LINK_STATE_FAILED)) { + if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_UNMANAGED, LINK_STATE_FAILED)) { r = link_acquire_ipv6_conf(link); if (r < 0) { link_enter_failed(link); @@ -2511,7 +2511,7 @@ static int link_carrier_gained(Link *link) { assert(link); - if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_PENDING, LINK_STATE_UNMANAGED, LINK_STATE_FAILED)) { + if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_UNMANAGED, LINK_STATE_FAILED)) { r = link_acquire_conf(link); if (r < 0) { link_enter_failed(link); |