External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 13:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Remove unnecessary goto error

Browse Source 
Freeing the dst is unnecessary if the VIR_STRDUP fails, and therefore
we need to remove the error label as well.
This commit is contained in:
Wang King 2017-04-24 12:05:25 +08:00 committed by Martin Kletzander
parent f69340472c
commit 0023cc039d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/remote.c
View File

@ -648,7 +648,7 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn,
/* build return data */ /* build return data */
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
if (VIR_STRDUP(data.path, path) < 0) if (VIR_STRDUP(data.path, path) < 0)
goto error; return -1;
data.type = type; data.type = type;
data.status = status; data.status = status;
make_nonnull_domain(&data.dom, dom); make_nonnull_domain(&data.dom, dom);
@ -667,9 +667,6 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn,
} }
return 0; return 0;
error:
VIR_FREE(data.path);
return -1;
} }
@ -1025,7 +1022,7 @@ remoteRelayDomainEventBlockJob2(virConnectPtr conn,
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
data.callbackID = callback->callbackID; data.callbackID = callback->callbackID;
if (VIR_STRDUP(data.dst, dst) < 0) if (VIR_STRDUP(data.dst, dst) < 0)
goto error; return -1;
data.type = type; data.type = type;
data.status = status; data.status = status;
make_nonnull_domain(&data.dom, dom); make_nonnull_domain(&data.dom, dom);
@ -1035,9 +1032,6 @@ remoteRelayDomainEventBlockJob2(virConnectPtr conn,
(xdrproc_t)xdr_remote_domain_event_block_job_2_msg, &data); (xdrproc_t)xdr_remote_domain_event_block_job_2_msg, &data);
return 0; return 0;
error:
VIR_FREE(data.dst);
return -1;
} }