From: Barrett Schonefeld <bschoney@utexas.edu>
Date: Mon, 23 Nov 2020 22:09:46 +0000 (-0600)
Subject: util: secret: remove cleanup labels
X-Git-Tag: v6.10.0-rc1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b67080b3451fced61fa92f2e445d325a4286fa5f;p=thirdparty%2Flibvirt.git

util: secret: remove cleanup labels

Signed-off-by: Barrett Schonefeld <bschoney@utexas.edu>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virsecret.c b/src/util/virsecret.c
index 78a3b41bc5..9ed803d45b 100644
--- a/src/util/virsecret.c
+++ b/src/util/virsecret.c
@@ -67,27 +67,26 @@ virSecretLookupParseSecret(xmlNodePtr secretnode,
 {
     g_autofree char *uuid = NULL;
     g_autofree char *usage = NULL;
-    int ret = -1;
 
     uuid = virXMLPropString(secretnode, "uuid");
     usage = virXMLPropString(secretnode, "usage");
     if (uuid == NULL && usage == NULL) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("missing secret uuid or usage attribute"));
-        goto cleanup;
+        return -1;
     }
 
     if (uuid && usage) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("either secret uuid or usage expected"));
-        goto cleanup;
+        return -1;
     }
 
     if (uuid) {
         if (virUUIDParse(uuid, def->u.uuid) < 0) {
             virReportError(VIR_ERR_XML_ERROR,
                            _("invalid secret uuid '%s'"), uuid);
-            goto cleanup;
+            return -1;
         }
         def->type = VIR_SECRET_LOOKUP_TYPE_UUID;
     } else {
@@ -95,10 +94,7 @@ virSecretLookupParseSecret(xmlNodePtr secretnode,
         usage = NULL;
         def->type = VIR_SECRET_LOOKUP_TYPE_USAGE;
     }
-    ret = 0;
-
- cleanup:
-    return ret;
+    return 0;
 }