mirror of
https://github.com/systemd/systemd
synced 2024-10-14 12:04:49 +00:00
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.
This commit is contained in:
parent
cf6c8c46fc
commit
201f0c916d
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue