From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 19 Sep 2019 14:04:56 +0000 (+0200)
Subject: conf: Use VIR_AUTO* in virDomainCapsCPUModelsAdd
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=537768a7cab57a3ff483256412c05710e7261640;p=libvirt.git

conf: Use VIR_AUTO* in virDomainCapsCPUModelsAdd

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index f922cb9055..9167fba7c9 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -242,25 +242,20 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
                           virDomainCapsCPUUsable usable,
                           char **blockers)
 {
-    char *nameCopy = NULL;
-    char **blockersCopy = NULL;
+    g_autofree char * nameCopy = NULL;
+    VIR_AUTOSTRINGLIST blockersCopy = NULL;
 
     if (VIR_STRNDUP(nameCopy, name, nameLen) < 0)
-        goto error;
+        return -1;
 
     if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0)
-        goto error;
+        return -1;
 
     if (virDomainCapsCPUModelsAddSteal(cpuModels, &nameCopy,
                                        usable, &blockersCopy) < 0)
-        goto error;
+        return -1;
 
     return 0;
-
- error:
-    VIR_FREE(nameCopy);
-    virStringListFree(blockersCopy);
-    return -1;
 }