From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 23 Mar 2021 16:42:31 +0000 (+0100)
Subject: virResctrlAllocNewFromInfo: Use g_autoptr for 'ret'
X-Git-Tag: v7.3.0-rc1~287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05350e451c1f052bd6223fa9fd3ff9346e34103f;p=thirdparty%2Flibvirt.git

virResctrlAllocNewFromInfo: Use g_autoptr for 'ret'

Remove 'cleanup' and 'error' labels by switching 'ret' to automatic
pointer and stealing it in the return statement.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 5e7c391524..c66cf4b087 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -1811,7 +1811,7 @@ static virResctrlAllocPtr
 virResctrlAllocNewFromInfo(virResctrlInfoPtr info)
 {
     size_t i = 0;
-    virResctrlAllocPtr ret = virResctrlAllocNew();
+    g_autoptr(virResctrlAlloc) ret = virResctrlAllocNew();
 
     if (!ret)
         return NULL;
@@ -1836,7 +1836,7 @@ virResctrlAllocNewFromInfo(virResctrlInfoPtr info)
 
             for (k = 0; k <= i_type->max_cache_id; k++) {
                 if (virResctrlAllocUpdateMask(ret, i, j, k, mask) < 0)
-                    goto error;
+                    return NULL;
             }
         }
     }
@@ -1854,12 +1854,7 @@ virResctrlAllocNewFromInfo(virResctrlInfoPtr info)
         }
     }
 
- cleanup:
-    return ret;
- error:
-    virObjectUnref(ret);
-    ret = NULL;
-    goto cleanup;
+    return g_steal_pointer(&ret);
 }
 
 /*