]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd: use strv_fnmatch() (#3605)
author0xAX <0xAX@users.noreply.github.com>
Sun, 26 Jun 2016 15:37:24 +0000 (18:37 +0300)
committerMartin Pitt <martin.pitt@ubuntu.com>
Sun, 26 Jun 2016 15:37:24 +0000 (17:37 +0200)
src/network/networkd-wait-online-manager.c

index 2ff7ddb04420f33307bde943b4f0d3cb26108dd6..725b3310dd8b2bcd88636566a5e6f95044acbb7c 100644 (file)
@@ -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) {