conf: convert final DIR* to g_autoptr

This use of DIR* was re-using the same function-scope DIR* each time
through a for loop, and due to multiple error gotos in the loop, it
needed to have the scope of the DIR* reduced to just the loop at the
same time as switching to g_autoptr. That's what this patch does.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 18b2612d2e4393fa2e6e4da920a3a11e523e45b1..425f34113a293bd6ff35af2a7f51bc68752ac868 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1837,7 +1837,6 @@ virCapabilitiesInitCaches(virCapsPtr caps)
     size_t i = 0;
     virBitmapPtr cpus = NULL;
     ssize_t pos = -1;
-    DIR *dirp = NULL;
     int ret = -1;
     char *path = NULL;
     char *type = NULL;
@@ -1860,13 +1859,11 @@ virCapabilitiesInitCaches(virCapsPtr caps)
 
     while ((pos = virBitmapNextSetBit(cpus, pos)) >= 0) {
         int rv = -1;
+        g_autoptr(DIR) dirp = NULL;
 
         VIR_FREE(path);
         path = g_strdup_printf("%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos);
 
-        VIR_DIR_CLOSE(dirp);
-        dirp = NULL;
-
         rv = virDirOpenIfExists(&dirp, path);
         if (rv < 0)
             goto cleanup;
@@ -1971,7 +1968,6 @@ virCapabilitiesInitCaches(virCapsPtr caps)
  cleanup:
     VIR_FREE(type);
     VIR_FREE(path);
-    VIR_DIR_CLOSE(dirp);
     virCapsHostCacheBankFree(bank);
     virBitmapFree(cpus);
     return ret;