tree-wide: make parse_ifindex simply return the index

[thirdparty/systemd.git] / src / nspawn / nspawn-network.c

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 9c9cf4812e8f2cb8a0fea709dcefd443c89c5f7e..b2592b023dd8aa32c714eb26005d4eb46d7250ee 100644 (file)
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -337,9 +337,9 @@ static int join_bridge(sd_netlink *rtnl, const char *veth_name, const char *brid
         assert(veth_name);
         assert(bridge_name);
 
-        r = parse_ifindex_or_ifname(bridge_name, &bridge_ifi);
-        if (r < 0)
-                return r;
+        bridge_ifi = parse_ifindex_or_ifname(bridge_name);
+        if (bridge_ifi < 0)
+                return bridge_ifi;
 
         r = sd_rtnl_message_new_link(rtnl, &m, RTM_SETLINK, 0);
         if (r < 0)
@@ -473,11 +473,11 @@ int remove_bridge(const char *bridge_name) {
 }
 
 static int parse_interface(const char *name) {
-        int ifi, r;
+        int ifi;
 
-        r = parse_ifindex_or_ifname(name, &ifi);
-        if (r < 0)
-                return log_error_errno(r, "Failed to resolve interface %s: %m", name);
+        ifi = parse_ifindex_or_ifname(name);
+        if (ifi < 0)
+                return log_error_errno(ifi, "Failed to resolve interface %s: %m", name);
 
         return ifi;
 }