[PATCH v1 01/25] libvirt-domain.c: modernize virDomainMigrateCheckNotLocal()

Daniel Henrique Barboza danielhb413 at gmail.com
Mon Jul 13 09:49:33 UTC 2020


Use g_autoptr() and remove the 'cleanup' label.

Signed-off-by: Daniel Henrique Barboza <danielhb413 at gmail.com>
---
 src/libvirt-domain.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 9f65cba2e8..0941caa67f 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -3286,22 +3286,17 @@ virDomainMigrateVersion3Params(virDomainPtr domain,
 static int
 virDomainMigrateCheckNotLocal(const char *dconnuri)
 {
-    virURIPtr tempuri = NULL;
-    int ret = -1;
+    g_autoptr(virURI) tempuri = NULL;
 
     if (!(tempuri = virURIParse(dconnuri)))
-        goto cleanup;
+        return -1;
     if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) {
         virReportInvalidArg(dconnuri, "%s",
                             _("Attempt to migrate guest to the same host"));
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
-
- cleanup:
-    virURIFree(tempuri);
-    return ret;
+    return 0;
 }
 
 
-- 
2.26.2




More information about the libvir-list mailing list