External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: use g_steal_pointer in network_conf.c

Browse Source 
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Laine Stump 2020-06-11 00:04:39 -04:00
parent 257aba2daf
commit 1eabe312ea
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/conf/network_conf.c
View File

@ -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++;
}