From: Christian Brauner Date: Wed, 3 Jul 2019 19:39:24 +0000 (+0200) Subject: network: simplify instantiate_macvlan() X-Git-Tag: lxc-3.2.0~14^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8021de256413a104eb5bc540ff7864bde1f4619e;p=thirdparty%2Flxc.git network: simplify instantiate_macvlan() Signed-off-by: Christian Brauner --- diff --git a/src/lxc/network.c b/src/lxc/network.c index ab4907a4c..18036ea40 100644 --- 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"); - if (err < 0 || (size_t)err >= sizeof(peerbuf)) + err = snprintf(peer, sizeof(peer), "mcXXXXXX"); + if (err < 0 || (size_t)err >= sizeof(peer)) return -1; - peer = lxc_mkifname(peerbuf); - if (!peer) + if (!lxc_mkifname(peer)) return -1; err = lxc_macvlan_create(netdev->link, peer,