From 8ec7c8ce7634aa169d881097c0e4863cfc6b5ec0 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Thu, 21 Jun 2018 15:50:01 +0200 Subject: [PATCH] conf: Replace error label with cleanup in virDomainGraphicsDefParseVNCXML Signed-off-by: Erik Skultety Reviewed-by: John Ferlan --- 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 77aae06d59..7c9d04c924 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13569,13 +13569,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) { @@ -13604,7 +13604,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; } } @@ -13616,7 +13616,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; } @@ -13626,10 +13626,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); -- GitLab