提交 62464003 编写于 作者: M Michal Privoznik

virnetworkobj: Drop needless cleanup label in virNetworkObjAddPort

The cleanup label in virNetworkObjAddPort() function serves no
purpose. Drop it and thus simplify the function a bit.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
上级 37d8d6b9
...@@ -1625,7 +1625,6 @@ virNetworkObjAddPort(virNetworkObjPtr net, ...@@ -1625,7 +1625,6 @@ virNetworkObjAddPort(virNetworkObjPtr net,
virNetworkPortDefPtr portdef, virNetworkPortDefPtr portdef,
const char *stateDir) const char *stateDir)
{ {
int ret = -1;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
VIR_AUTOFREE(char *) dir = NULL; VIR_AUTOFREE(char *) dir = NULL;
...@@ -1635,24 +1634,21 @@ virNetworkObjAddPort(virNetworkObjPtr net, ...@@ -1635,24 +1634,21 @@ virNetworkObjAddPort(virNetworkObjPtr net,
virReportError(VIR_ERR_NETWORK_PORT_EXIST, virReportError(VIR_ERR_NETWORK_PORT_EXIST,
_("Network port with UUID %s already exists"), _("Network port with UUID %s already exists"),
uuidstr); uuidstr);
goto cleanup; return -1;
} }
if (!(dir = virNetworkObjGetPortStatusDir(net, stateDir))) if (!(dir = virNetworkObjGetPortStatusDir(net, stateDir)))
goto cleanup; return -1;
if (virHashAddEntry(net->ports, uuidstr, portdef) < 0) if (virHashAddEntry(net->ports, uuidstr, portdef) < 0)
goto cleanup; return -1;
if (virNetworkPortDefSaveStatus(portdef, dir) < 0) { if (virNetworkPortDefSaveStatus(portdef, dir) < 0) {
virHashRemoveEntry(net->ports, uuidstr); virHashRemoveEntry(net->ports, uuidstr);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册