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

virnetworkobj: Drop needless cleanup label in virNetworkObjDeletePort

Browse Source 
The cleanup label in virNetworkObjDeletePort() function serves no
purpose. Drop it and thus simplify the function a bit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Michal Privoznik 2019-07-09 16:57:44 +02:00
parent 6246400329
commit 87050bcede
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/conf/virnetworkobj.c
View File

@ -1678,9 +1678,8 @@ virNetworkObjDeletePort(virNetworkObjPtr net,
const unsigned char *uuid, const unsigned char *uuid,
const char *stateDir) const char *stateDir)
{ {
int ret = -1;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
char *dir = NULL; VIR_AUTOFREE(char *) dir = NULL;
virNetworkPortDefPtr portdef; virNetworkPortDefPtr portdef;
virUUIDFormat(uuid, uuidstr); virUUIDFormat(uuid, uuidstr);
@ -1689,23 +1688,19 @@ virNetworkObjDeletePort(virNetworkObjPtr net,
virReportError(VIR_ERR_NO_NETWORK_PORT, virReportError(VIR_ERR_NO_NETWORK_PORT,
_("Network port with UUID %s does not exist"), _("Network port with UUID %s does not exist"),
uuidstr); uuidstr);
goto cleanup; return -1;
} }
if (!(dir = virNetworkObjGetPortStatusDir(net, stateDir))) if (!(dir = virNetworkObjGetPortStatusDir(net, stateDir)))
goto cleanup; return -1;
if (virNetworkPortDefDeleteStatus(portdef, dir) < 0) if (virNetworkPortDefDeleteStatus(portdef, dir) < 0)
goto cleanup; return -1;
if (virHashRemoveEntry(net->ports, uuidstr) < 0) if (virHashRemoveEntry(net->ports, uuidstr) < 0)
goto cleanup; return -1;
ret = 0; return 0;
cleanup:
VIR_FREE(dir);
return ret;
} }