]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkctl: use parse_ifindex_or_ifname() 12687/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 29 May 2019 02:02:09 +0000 (11:02 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 29 May 2019 04:22:01 +0000 (13:22 +0900)
src/network/networkctl.c

index 5e3095917fc26d6cf9e70ab91835906440585fdc..321fe92f09adf3f4b7e8f66eae581d5c28452ba9 100644 (file)
@@ -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)