From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 29 May 2019 02:02:09 +0000 (+0900)
Subject: networkctl: use parse_ifindex_or_ifname()
X-Git-Tag: v243-rc1~353^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12687%2Fhead;p=thirdparty%2Fsystemd.git

networkctl: use parse_ifindex_or_ifname()
---

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 5e3095917fc..321fe92f09a 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1089,12 +1089,9 @@ static int link_delete(int argc, char *argv[], void *userdata) {
                 return log_oom();
 
         for (i = 1; i < argc; i++) {
-                r = parse_ifindex(argv[i], &index);
-                if (r < 0) {
-                        index = (int) if_nametoindex(argv[i]);
-                        if (index <= 0)
-                                return log_error_errno(r, "Failed to resolve interface %s", argv[i]);
-                }
+                r = parse_ifindex_or_ifname(argv[i], &index);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to resolve interface %s", argv[i]);
 
                 r = set_put(indexes, INT_TO_PTR(index));
                 if (r < 0)