From 1eabe312ea4fa80922443ad73a950857c1f87786 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Thu, 11 Jun 2020 00:04:39 -0400 Subject: [PATCH] conf: use g_steal_pointer in network_conf.c Signed-off-by: Laine Stump Reviewed-by: Erik Skultety --- src/conf/network_conf.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index ebe8a03262..87d43de1e3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -617,12 +617,9 @@ virNetworkDHCPHostDefParseXML(const char *networkName, cur = cur->next; } - host->mac = mac; - mac = NULL; - host->id = id; - id = NULL; - host->name = name; - name = NULL; + host->mac = g_steal_pointer(&mac); + host->id = g_steal_pointer(&id); + host->name = g_steal_pointer(&name); if (ip) host->ip = inaddr; @@ -681,8 +678,7 @@ virNetworkDHCPDefParseXML(const char *networkName, goto cleanup; } - def->bootfile = file; - file = NULL; + def->bootfile = g_steal_pointer(&file); def->bootserver = inaddr; } @@ -1556,9 +1552,8 @@ virNetworkForwardDefParseXML(const char *networkName, return -1; if (forwardDev) { - def->ifs[0].device.dev = forwardDev; + def->ifs[0].device.dev = g_steal_pointer(&forwardDev); def->ifs[0].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; - forwardDev = NULL; def->nifs++; } @@ -1599,8 +1594,7 @@ virNetworkForwardDefParseXML(const char *networkName, } } - def->ifs[i].device.dev = forwardDevi; - forwardDevi = NULL; + def->ifs[i].device.dev = g_steal_pointer(&forwardDevi); def->ifs[i].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; def->nifs++; } @@ -1676,8 +1670,7 @@ virNetworkForwardDefParseXML(const char *networkName, return -1; } - def->pfs->dev = forwardDev; - forwardDev = NULL; + def->pfs->dev = g_steal_pointer(&forwardDev); def->npfs++; }