summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author0xAX <0xAX@users.noreply.github.com>2016-06-26 18:37:24 +0300
committerMartin Pitt <martin.pitt@ubuntu.com>2016-06-26 17:37:24 +0200
commit03fb3334589fb65e7e158e35ed5e68fa8824280c (patch)
treefaca2b04a0a9277d73db81bf51fc22c86dcd536c
parentcdfe156acdf159341cf7771b019f1aa08a19acac (diff)
networkd: use strv_fnmatch() (#3605)
-rw-r--r--src/network/networkd-wait-online-manager.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c
index 2ff7ddb044..725b3310dd 100644
--- a/src/network/networkd-wait-online-manager.c
+++ b/src/network/networkd-wait-online-manager.c
@@ -30,8 +30,6 @@
#include "util.h"
bool manager_ignore_link(Manager *m, Link *link) {
- char **ignore;
-
assert(m);
assert(link);
@@ -44,11 +42,7 @@ bool manager_ignore_link(Manager *m, Link *link) {
return true;
/* ignore interfaces we explicitly are asked to ignore */
- STRV_FOREACH(ignore, m->ignore)
- if (fnmatch(*ignore, link->ifname, 0) == 0)
- return true;
-
- return false;
+ return strv_fnmatch(m->ignore, link->ifname, 0);
}
bool manager_all_configured(Manager *m) {