[libvirt PATCH v2 3/8] cpu_map: Use g_auto* in loadIncludes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Tim Wiederhake <twiederh@xxxxxxxxxx>
---
 src/cpu/cpu_map.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
index 53c8cbba6b..ac98a14e2e 100644
--- a/src/cpu/cpu_map.c
+++ b/src/cpu/cpu_map.c
@@ -125,18 +125,16 @@ loadIncludes(xmlXPathContextPtr ctxt,
         return -1;
 
     for (i = 0; i < n; i++) {
-        char *filename = virXMLPropString(nodes[i], "filename");
-        if (!filename) {
+        g_autofree char *filename = NULL;
+
+        if (!(filename = virXMLPropString(nodes[i], "filename"))) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("Missing 'filename' in CPU map include"));
             return -1;
         }
         VIR_DEBUG("Finding CPU map include '%s'", filename);
-        if (cpuMapLoadInclude(filename, vendorCB, featureCB, modelCB, data) < 0) {
-            VIR_FREE(filename);
+        if (cpuMapLoadInclude(filename, vendorCB, featureCB, modelCB, data) < 0)
             return -1;
-        }
-        VIR_FREE(filename);
     }
 
     return 0;
-- 
2.26.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux