External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 07:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: refactor remoteSerializeDHCPLease

Browse Source 
Use g_new0 for allocation and remove all the temporary
variables.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Ján Tomko 2020-10-08 12:21:01 +02:00
parent c3d02040ac
commit d0de0431ff
1 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/remote/remote_daemon_dispatch.c
View File

@ -6684,11 +6684,6 @@ remoteDispatchNodeGetFreePages(virNetServerPtr server G_GNUC_UNUSED,
static int static int
remoteSerializeDHCPLease(remote_network_dhcp_lease *lease_dst, virNetworkDHCPLeasePtr lease_src) remoteSerializeDHCPLease(remote_network_dhcp_lease *lease_dst, virNetworkDHCPLeasePtr lease_src)
{ {
char **mac_tmp = NULL;
char **iaid_tmp = NULL;
char **hostname_tmp = NULL;
char **clientid_tmp = NULL;
lease_dst->expirytime = lease_src->expirytime; lease_dst->expirytime = lease_src->expirytime;
lease_dst->type = lease_src->type; lease_dst->type = lease_src->type;
lease_dst->prefix = lease_src->prefix; lease_dst->prefix = lease_src->prefix;
@ -6697,49 +6692,23 @@ remoteSerializeDHCPLease(remote_network_dhcp_lease *lease_dst, virNetworkDHCPLea
lease_dst->ipaddr = g_strdup(lease_src->ipaddr); lease_dst->ipaddr = g_strdup(lease_src->ipaddr);
if (lease_src->mac) { if (lease_src->mac) {
if (VIR_ALLOC(mac_tmp) < 0) lease_dst->mac = g_new0(char *, 1);
goto error; *lease_dst->mac = g_strdup(lease_src->mac);
*mac_tmp = g_strdup(lease_src->mac);
} }
if (lease_src->iaid) { if (lease_src->iaid) {
if (VIR_ALLOC(iaid_tmp) < 0) lease_dst->iaid = g_new0(char *, 1);
goto error; *lease_dst->iaid = g_strdup(lease_src->iaid);
*iaid_tmp = g_strdup(lease_src->iaid);
} }
if (lease_src->hostname) { if (lease_src->hostname) {
if (VIR_ALLOC(hostname_tmp) < 0) lease_dst->hostname = g_new0(char *, 1);
goto error; *lease_dst->hostname = g_strdup(lease_src->hostname);
*hostname_tmp = g_strdup(lease_src->hostname);
} }
if (lease_src->clientid) { if (lease_src->clientid) {
if (VIR_ALLOC(clientid_tmp) < 0) lease_dst->clientid = g_new0(char *, 1);
goto error; *lease_dst->clientid = g_strdup(lease_src->clientid);
*clientid_tmp = g_strdup(lease_src->clientid);
} }
lease_dst->mac = mac_tmp;
lease_dst->iaid = iaid_tmp;
lease_dst->hostname = hostname_tmp;
lease_dst->clientid = clientid_tmp;
return 0; return 0;
error:
if (mac_tmp)
VIR_FREE(*mac_tmp);
if (iaid_tmp)
VIR_FREE(*iaid_tmp);
if (hostname_tmp)
VIR_FREE(*hostname_tmp);
if (clientid_tmp)
VIR_FREE(*clientid_tmp);
VIR_FREE(mac_tmp);
VIR_FREE(iaid_tmp);
VIR_FREE(hostname_tmp);
VIR_FREE(clientid_tmp);
VIR_FREE(lease_dst->ipaddr);
VIR_FREE(lease_dst->iface);
return -1;
} }