From 314dac422d9323e9bf8159cd63e7075eb6bba824 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 9 Dec 2021 16:33:08 +0100 Subject: [PATCH] network: Initialize variables in networkDnsmasqConfContents() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In networkDnsmasqConfContents() there's a for() loop which initializes some variables in its initialization block. This makes both the loop() statement and variable declaration block look needlessly ugly. Speaking of variable declaration, also move some variables which are used only within blocks into their respective blocks. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- src/network/bridge_driver.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index ca1e0ca50f..10099571c2 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1004,15 +1004,14 @@ networkDnsmasqConfContents(virNetworkObj *obj, { virNetworkDef *def = virNetworkObjGetDef(obj); g_auto(virBuffer) configbuf = VIR_BUFFER_INITIALIZER; - int r; int nbleases = 0; size_t i; virNetworkDNSDef *dns = &def->dns; bool wantDNS = dns->enable != VIR_TRISTATE_BOOL_NO; - virNetworkIPDef *ipdef; - virNetworkIPDef *ipv4def; - virNetworkIPDef *ipv6def; - bool ipv6SLAAC; + virNetworkIPDef *ipdef = NULL; + virNetworkIPDef *ipv4def = NULL; + virNetworkIPDef *ipv6def = NULL; + bool ipv6SLAAC = false; *configstr = NULL; @@ -1211,9 +1210,7 @@ networkDnsmasqConfContents(virNetworkObj *obj, } /* Find the first dhcp for both IPv4 and IPv6 */ - for (i = 0, ipv4def = NULL, ipv6def = NULL, ipv6SLAAC = false; - (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); - i++) { + for (i = 0; (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); i++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { if (ipv4def) { @@ -1255,6 +1252,7 @@ networkDnsmasqConfContents(virNetworkObj *obj, while (ipdef) { int prefix; + int r; prefix = virNetworkIPDefPrefix(ipdef); if (prefix < 0) { -- 2.47.2