From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 8 Nov 2021 11:44:11 +0000 (+0100)
Subject: testLXCCapsInit: Cleanup
X-Git-Tag: v7.10.0-rc1~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fc3f05293f4a35b0e1a147b2d2864ff8f8ee7f1;p=thirdparty%2Flibvirt.git

testLXCCapsInit: Cleanup

Remove unnecessary label and goto. Cleanup line breaks.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c
index 857407dfb2..ac7a01a4e8 100644
--- a/tests/testutilslxc.c
+++ b/tests/testutilslxc.c
@@ -11,11 +11,10 @@
 virCaps *
 testLXCCapsInit(void)
 {
-    virCaps *caps;
+    g_autoptr(virCaps) caps = NULL;
     virCapsGuest *guest;
 
-    if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64,
-                                   false, false)) == NULL)
+    if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64, false, false)) == NULL)
         return NULL;
 
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
@@ -33,20 +32,14 @@ testLXCCapsInit(void)
     virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, NULL, 0, NULL);
 
     if (virTestGetDebug()) {
-        g_autofree char *caps_str = NULL;
-
-        caps_str = virCapabilitiesFormatXML(caps);
+        g_autofree char *caps_str = virCapabilitiesFormatXML(caps);
         if (!caps_str)
-            goto error;
+            return NULL;
 
         VIR_TEST_DEBUG("LXC driver capabilities:\n%s", caps_str);
     }
 
-    return caps;
-
- error:
-    virObjectUnref(caps);
-    return NULL;
+    return g_steal_pointer(&caps);
 }