]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: Replace error label with cleanup in virDomainGraphicsDefParseVNCXML
authorErik Skultety <eskultet@redhat.com>
Thu, 21 Jun 2018 13:50:01 +0000 (15:50 +0200)
committerErik Skultety <eskultet@redhat.com>
Mon, 9 Jul 2018 15:45:19 +0000 (17:45 +0200)
Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
src/conf/domain_conf.c

index 77aae06d598ccc48cb97d5752bc944b6a36e6519..7c9d04c9242f532dc6c5c21d26f08938d4fa638c 100644 (file)
@@ -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);