From 4bddccc684e9c30ba825dae5175b710843c41d56 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 29 May 2019 11:02:09 +0900 Subject: [PATCH] networkctl: use parse_ifindex_or_ifname() --- src/network/networkctl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 5e30959..321fe92 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) -- 2.7.4