From 8687408f905a94bd980cfdcd5741292db07d568b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Tue, 28 Jul 2020 20:09:22 +0200 Subject: [PATCH] util: virNetDevBridgeSet: split declarations MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Declare the variables at the beginning of the function, then fill them up. Signed-off-by: Ján Tomko Reviewed-by: Michal Privoznik --- src/util/virnetdevbridge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index e1ba119b8b..8ce1a07c41 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -119,6 +119,8 @@ static int virNetDevBridgeSet(const char *brname, struct ifreq *ifr) /* pre-filled bridge name */ { g_autofree char *path = NULL; + unsigned long args[] = { 0, value, 0, 0 }; + unsigned long paramid; path = g_strdup_printf(SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); @@ -129,7 +131,6 @@ static int virNetDevBridgeSet(const char *brname, VIR_DEBUG("Unable to set bridge %s %s via sysfs", brname, paramname); } - unsigned long paramid; if (STREQ(paramname, "stp_state")) { paramid = BRCTL_SET_BRIDGE_STP_STATE; } else if (STREQ(paramname, "forward_delay")) { @@ -140,7 +141,8 @@ static int virNetDevBridgeSet(const char *brname, brname, paramname); return -1; } - unsigned long args[] = { paramid, value, 0, 0 }; + + args[0] = paramid; ifr->ifr_data = (char*)&args; if (ioctl(fd, SIOCDEVPRIVATE, ifr) < 0) { virReportSystemError(errno, -- 2.47.2