From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Mon, 6 Jan 2020 21:57:30 +0000 (-0300)
Subject: storage: remove unneeded labels
X-Git-Tag: v6.0.0-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05a18bbb074e8a09d04c36d0f4244f6f351e4660;p=thirdparty%2Flibvirt.git

storage: remove unneeded labels

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c
index 2afa617cc1..3a5e2bb9f0 100644
--- a/src/storage/storage_backend_iscsi_direct.c
+++ b/src/storage/storage_backend_iscsi_direct.c
@@ -572,13 +572,11 @@ virStorageBackendISCSIDirectSetConnection(virStoragePoolObjPtr pool,
     if (portalRet)
         *portalRet = g_steal_pointer(&portal);
 
- cleanup:
     return iscsi;
 
  error:
     iscsi_destroy_context(iscsi);
-    iscsi = NULL;
-    goto cleanup;
+    return NULL;
 }
 
 static int
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 6bbf52f729..0bb116cf08 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -2771,13 +2771,13 @@ storageConnectStoragePoolEventRegisterAny(virConnectPtr conn,
     int callbackID = -1;
 
     if (virConnectStoragePoolEventRegisterAnyEnsureACL(conn) < 0)
-        goto cleanup;
+        return -1;
 
     if (virStoragePoolEventStateRegisterID(conn, driver->storageEventState,
                                            pool, eventID, callback,
                                            opaque, freecb, &callbackID) < 0)
         callbackID = -1;
- cleanup:
+
     return callbackID;
 }