[libvirt] [PATCH v1 04/11] conf: Replace error label with cleanup in virDomainGraphicsDefParseVNCXML
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d887df2c3e..09d9bac739 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13568,13 +13568,13 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
int ret = -1;
if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0)
- goto error;
+ goto cleanup;
if (port) {
if (virStrToLong_i(port, NULL, 10, &def->data.vnc.port) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse vnc port %s"), port);
- goto error;
+ goto cleanup;
}
/* Legacy compat syntax, used -1 for auto-port */
if (def->data.vnc.port == -1) {
@@ -13603,7 +13603,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
&def->data.vnc.websocket) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse vnc WebSocket port %s"),
websocket);
- goto error;
+ goto cleanup;
}
}
@@ -13615,7 +13615,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown vnc display sharing policy
'%s'"),
sharePolicy);
- goto error;
+ goto cleanup;
} else {
def->data.vnc.sharePolicy = policy;
}
@@ -13625,10 +13625,10 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth,
def->type) < 0)
- goto error;
+ goto cleanup;
ret = 0;
- error:
+ cleanup:
VIR_FREE(port);
VIR_FREE(autoport);
VIR_FREE(websocket);
--
2.14.4