picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

resolved: fix negated boolean function

Browse source 
It's weird having a "negative" function link_is_unmanaged(), let's invert it
and get rid of the negation this way, by renaming it to link_is_managed().

Internally we stored this as a positive boolean already, hence let's do this
for the function too.
This commit is contained in:
Lennart Poettering 2016-06-15 22:35:23 +02:00
parent 55e99f2064
commit b6274a0e9e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/resolve/resolved-link.c
View file

@ -447,7 +447,7 @@ clear:
return r;
}
static int link_is_unmanaged(Link *l) {
static int link_is_managed(Link *l) {
_cleanup_free_ char *state = NULL;
int r;
@ -455,11 +455,11 @@ static int link_is_unmanaged(Link *l) {
r = sd_network_link_get_setup_state(l->ifindex, &state);
if (r == -ENODATA)
return 1;
return 0;
if (r < 0)
return r;
return STR_IN_SET(state, "pending", "unmanaged");
return !STR_IN_SET(state, "pending", "unmanaged");
}
static void link_read_settings(Link *l) {
@ -469,12 +469,12 @@ static void link_read_settings(Link *l) {
/* Read settings from networkd, except when networkd is not managing this interface. */
r = link_is_unmanaged(l);
r = link_is_managed(l);
if (r < 0) {
log_warning_errno(r, "Failed to determine whether interface %s is managed: %m", l->name);
return;
}
if (r > 0) {
if (r == 0) {
/* If this link used to be managed, but is now unmanaged, flush all our settings — but only once. */
if (l->is_managed)