network: simplify instantiate_macvlan()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

network: simplify instantiate_macvlan()
8021de25 · Christian Brauner · 3ebffb98 · 8021de25
Unverified Commit 8021de25 authored Jul 03, 2019 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

network.c src/lxc/network.c +4 -5

No files found.
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -332,7 +332,7 @@ out_delete:
 static int instantiate_macvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
 {
-	char peerbuf[IFNAMSIZ], *peer;
+	char peer[IFNAMSIZ];
 	int err;
 	unsigned int mtu = 0;
@@ -341,12 +341,11 @@ static int instantiate_macvlan(struct lxc_handler *handler, struct lxc_netdev *n
 		return -1;
 	}
-	err = snprintf(peerbuf, sizeof(peerbuf), "mcXXXXXX");
+	err = snprintf(peer, sizeof(peer), "mcXXXXXX");
-	if (err < 0 || (size_t)err >= sizeof(peerbuf))
+	if (err < 0 || (size_t)err >= sizeof(peer))
 		return -1;
-	peer = lxc_mkifname(peerbuf);
+	if (!lxc_mkifname(peer))
-	if (!peer)
 		return -1;
 	err = lxc_macvlan_create(netdev->link, peer,