change DIR* int g_autoptr(DIR) where appropriate

All of these conversions are trivial - VIR_DIR_CLOSE() (aka
virDirClose()) is called only once on the DIR*, and it happens just
before going out of scope.

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

diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c
index 8a9acf52b01a0696962e7f38c0e5323eecf7e82d..e9b4e5176dd123f9118257d2e28d972957c56ee9 100644 (file)
--- a/src/bhyve/bhyve_capabilities.c
+++ b/src/bhyve/bhyve_capabilities.c
@@ -134,7 +134,7 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn,
 {
     virDomainCapsPtr caps = NULL;
     unsigned int bhyve_caps = 0;
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     size_t firmwares_alloc = 0;
     virBhyveDriverConfigPtr cfg = virBhyveDriverGetConfig(conn);
@@ -171,7 +171,6 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn,
 
  cleanup:
     VIR_FREE(firmwares);
-    VIR_DIR_CLOSE(dir);
     virObjectUnref(cfg);
     return caps;
 }

diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index e9a4b271df3a9450f4a70af8fdfc539ae16b0837..9c10090b3217105c6ec3b1c8399b4ee90018aa44 100644 (file)
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -588,7 +588,7 @@ virDomainObjListLoadAllConfigs(virDomainObjListPtr doms,
                                virDomainLoadConfigNotify notify,
                                void *opaque)
 {
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     int ret = -1;
     int rc;
@@ -633,7 +633,6 @@ virDomainObjListLoadAllConfigs(virDomainObjListPtr doms,
         }
     }
 
-    VIR_DIR_CLOSE(dir);
     virObjectRWUnlock(doms);
     return ret;
 }

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index 46205b163c406b6ce7c9d41aa0e0b4701eb22f72..acf1442f88d56188a1c0f4ec120e46c64a005b93 100644 (file)
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -1072,7 +1072,7 @@ virNetworkObjLoadAllState(virNetworkObjListPtr nets,
                           const char *stateDir,
                           virNetworkXMLOptionPtr xmlopt)
 {
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     int ret = -1;
     int rc;
@@ -1097,7 +1097,6 @@ virNetworkObjLoadAllState(virNetworkObjListPtr nets,
     }
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -1108,7 +1107,7 @@ virNetworkObjLoadAllConfigs(virNetworkObjListPtr nets,
                             const char *autostartDir,
                             virNetworkXMLOptionPtr xmlopt)
 {
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     int ret = -1;
     int rc;
@@ -1132,7 +1131,6 @@ virNetworkObjLoadAllConfigs(virNetworkObjListPtr nets,
         virNetworkObjEndAPI(&obj);
     }
 
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -1707,7 +1705,7 @@ virNetworkObjDeleteAllPorts(virNetworkObjPtr net,
                             const char *stateDir)
 {
     g_autofree char *dir = NULL;
-    DIR *dh = NULL;
+    g_autoptr(DIR) dh = NULL;
     struct dirent *de;
     int rc;
     int ret = -1;
@@ -1738,7 +1736,6 @@ virNetworkObjDeleteAllPorts(virNetworkObjPtr net,
 
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dh);
     return ret;
 }
 
@@ -1863,7 +1860,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net,
                           const char *stateDir)
 {
     g_autofree char *dir = NULL;
-    DIR *dh = NULL;
+    g_autoptr(DIR) dh = NULL;
     struct dirent *de;
     int ret = -1;
     int rc;
@@ -1901,6 +1898,5 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net,
 
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dh);
     return ret;
 }

diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 4cbb62abfa701b48a24853871944700e3e4458b9..194348d0629b93db7ef709c5fce96a5f36a814de 100644 (file)
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -300,7 +300,7 @@ int
 virNWFilterBindingObjListLoadAllConfigs(virNWFilterBindingObjListPtr bindings,
                                         const char *configDir)
 {
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     int ret = -1;
     int rc;
@@ -330,7 +330,6 @@ virNWFilterBindingObjListLoadAllConfigs(virNWFilterBindingObjListPtr bindings,
             VIR_ERROR(_("Failed to load config for binding '%s'"), entry->d_name);
     }
 
-    VIR_DIR_CLOSE(dir);
     virObjectRWUnlock(bindings);
     return ret;
 }

diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c
index fce402f907cc8454849af13619cf97f59804bad5..a6a5aa01c779c82462658499dbf2fe2f276e8c91 100644 (file)
--- a/src/conf/virnwfilterobj.c
+++ b/src/conf/virnwfilterobj.c
@@ -524,7 +524,7 @@ int
 virNWFilterObjListLoadAllConfigs(virNWFilterObjListPtr nwfilters,
                                  const char *configDir)
 {
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     int ret = -1;
     int rc;
@@ -543,7 +543,6 @@ virNWFilterObjListLoadAllConfigs(virNWFilterObjListPtr nwfilters,
             virNWFilterObjUnlock(obj);
     }
 
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index 146210fbe750d21bb2285a16aa2c7da0a615631a..fda3702415e36426da12be38a23635a20296b347 100644 (file)
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -896,7 +896,7 @@ int
 virSecretLoadAllConfigs(virSecretObjListPtr secrets,
                         const char *configDir)
 {
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *de;
     int rc;
 
@@ -926,6 +926,5 @@ virSecretLoadAllConfigs(virSecretObjListPtr secrets,
         virSecretObjEndAPI(&obj);
     }
 
-    VIR_DIR_CLOSE(dir);
     return 0;
 }

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 219594582c23ecc52a95e7bf519ba9509dd1aada..4aff62434f9a10116facf7da12b9c2e5c08182f8 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -1707,7 +1707,7 @@ int
 virStoragePoolObjLoadAllState(virStoragePoolObjListPtr pools,
                               const char *stateDir)
 {
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     int ret = -1;
     int rc;
@@ -1726,7 +1726,6 @@ virStoragePoolObjLoadAllState(virStoragePoolObjListPtr pools,
         virStoragePoolObjEndAPI(&obj);
     }
 
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -1736,7 +1735,7 @@ virStoragePoolObjLoadAllConfigs(virStoragePoolObjListPtr pools,
                                 const char *configDir,
                                 const char *autostartDir)
 {
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     int ret;
     int rc;
@@ -1768,7 +1767,6 @@ virStoragePoolObjLoadAllConfigs(virStoragePoolObjListPtr pools,
         VIR_FREE(autostartLink);
     }
 
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index ec0bf9192bca4451705fd2e7db4a4a7c341e52c9..b315894965dddb1d2817e01083fbc51d800c2f81 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1148,7 +1148,7 @@ udevGetVDPACharDev(const char *sysfs_path,
                    virNodeDevCapDataPtr data)
 {
     struct dirent *entry;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     int direrr;
 
     if (virDirOpenIfExists(&dir, sysfs_path) <= 0)
@@ -1162,7 +1162,6 @@ udevGetVDPACharDev(const char *sysfs_path,
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("vDPA chardev path '%s' does not exist"),
                                chardev);
-                VIR_DIR_CLOSE(dir);
                 return -1;
             }
             VIR_DEBUG("vDPA chardev is at '%s'", chardev);
@@ -1171,9 +1170,6 @@ udevGetVDPACharDev(const char *sysfs_path,
             break;
         }
     }
-
-    VIR_DIR_CLOSE(dir);
-
     if (direrr < 0)
         return -1;
 

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 8f1740863c1780e521673f425ccda50096622925..1783dce233ea234626539f96926faf45349ec680 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -1003,7 +1003,7 @@ openvzSetUUID(int vpsid)
 
 static int openvzAssignUUIDs(void)
 {
-    DIR *dp;
+    g_autoptr(DIR) dp = NULL;
     struct dirent *dent;
     char *conf_dir;
     int vpsid;
@@ -1028,7 +1028,6 @@ static int openvzAssignUUIDs(void)
             openvzSetUUID(vpsid);
     }
 
-    VIR_DIR_CLOSE(dp);
     VIR_FREE(conf_dir);
     return ret;
 }

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f1191c1210689533e67e2ad7b4120c5c09475310..cb56fbbfcf70a2631990145b66675e2bb61b31e8 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -357,7 +357,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm,
 {
     char *baseDir = (char *)data;
     g_autofree char *snapDir = NULL;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     virDomainSnapshotDefPtr def = NULL;
     virDomainMomentObjPtr snap = NULL;
@@ -457,7 +457,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm,
 
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dir);
     virObjectUnlock(vm);
     return ret;
 }
@@ -469,7 +468,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm,
 {
     char *baseDir = (char *)data;
     g_autofree char *chkDir = NULL;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     virDomainCheckpointDefPtr def = NULL;
     virDomainMomentObjPtr chk = NULL;
@@ -557,7 +556,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm,
 
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dir);
     virObjectUnlock(vm);
     return ret;
 }

diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c
index 7edca7540a7c36345128814cc2c07e3b06e408d9..f2d83eae93eadc0345e6e43e3e99f3099dbd4459 100644 (file)
--- a/src/qemu/qemu_interop_config.c
+++ b/src/qemu/qemu_interop_config.c
@@ -37,7 +37,7 @@ VIR_LOG_INIT("qemu.qemu_configs");
 static int
 qemuBuildFileList(virHashTablePtr files, const char *dir)
 {
-    DIR *dirp;
+    g_autoptr(DIR) dirp = NULL;
     struct dirent *ent = NULL;
     int rc;
     int ret = -1;
@@ -79,7 +79,6 @@ qemuBuildFileList(virHashTablePtr files, const char *dir)
 
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dirp);
     return ret;
 }
 

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 7d9e62a23922932588d1b05168be5df0432075ff..6681ce194beb896fddb6f32a8cdd9dc5989414e2 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -3464,7 +3464,7 @@ virSecuritySELinuxSetFileLabels(virSecurityManagerPtr mgr,
     int ret = 0;
     struct dirent *ent;
     char *filename = NULL;
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
 
     if ((ret = virSecuritySELinuxSetFilecon(mgr, path, seclabel->imagelabel, true)))
         return ret;
@@ -3487,7 +3487,6 @@ virSecuritySELinuxSetFileLabels(virSecurityManagerPtr mgr,
         virReportSystemError(errno, _("Unable to label files under %s"),
                              path);
 
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -3509,7 +3508,7 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManagerPtr mgr,
     int ret = 0;
     struct dirent *ent;
     char *filename = NULL;
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
 
     if ((ret = virSecuritySELinuxRestoreFileLabel(mgr, path, true)))
         return ret;
@@ -3531,7 +3530,6 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManagerPtr mgr,
         virReportSystemError(errno, _("Unable to restore file labels under %s"),
                              path);
 
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index 436d5e09c745b1456685ca6687479559f92fc4e2..45167e4490c0415ab42cd61b3e209abad9ee69a2 100644 (file)
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -90,7 +90,7 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path,
                                     uint32_t *host)
 {
     int ret = -1;
-    DIR *sysdir = NULL;
+    g_autoptr(DIR) sysdir = NULL;
     struct dirent *dirent = NULL;
     int direrr;
 
@@ -122,7 +122,6 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path,
     }
 
  cleanup:
-    VIR_DIR_CLOSE(sysdir);
     return ret;
 }
 

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 7eaf8998831cfb8006f16aa75087f60ac6da0bbb..5a5e517b152c005f6766f2d9008b35ec87b32931 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -1920,7 +1920,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool,
                             bool loop)
 {
     virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
-    DIR *dh;
+    g_autoptr(DIR) dh = NULL;
     struct dirent *dent;
     char *stablepath;
     int opentries = 0;
@@ -1963,7 +1963,6 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool,
         stablepath = g_strdup_printf("%s/%s", def->target.path, dent->d_name);
 
         if (virFileLinkPointsTo(stablepath, devpath)) {
-            VIR_DIR_CLOSE(dh);
             return stablepath;
         }
 
@@ -1975,8 +1974,6 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool,
         goto retry;
     }
 
-    VIR_DIR_CLOSE(dh);
-
  ret_strdup:
     /* Couldn't find any matching stable link so give back
      * the original non-stable dev path
@@ -3505,7 +3502,7 @@ int
 virStorageBackendRefreshLocal(virStoragePoolObjPtr pool)
 {
     virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *ent;
     struct statvfs sb;
     struct stat statbuf;
@@ -3595,7 +3592,6 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool)
 
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -3726,7 +3722,7 @@ getNewStyleBlockDevice(const char *lun_path,
                        const char *block_name G_GNUC_UNUSED,
                        char **block_device)
 {
-    DIR *block_dir = NULL;
+    g_autoptr(DIR) block_dir = NULL;
     struct dirent *block_dirent = NULL;
     int retval = -1;
     int direrr;
@@ -3753,7 +3749,6 @@ getNewStyleBlockDevice(const char *lun_path,
     retval = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(block_dir);
     return retval;
 }
 
@@ -3799,7 +3794,7 @@ getBlockDevice(uint32_t host,
                uint32_t lun,
                char **block_device)
 {
-    DIR *lun_dir = NULL;
+    g_autoptr(DIR) lun_dir = NULL;
     struct dirent *lun_dirent = NULL;
     int retval = -1;
     int direrr;
@@ -3839,7 +3834,6 @@ getBlockDevice(uint32_t host,
     retval = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(lun_dir);
     return retval;
 }
 
@@ -3968,7 +3962,7 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool,
     int retval = 0;
     uint32_t bus, target, lun;
     const char *device_path = "/sys/bus/scsi/devices";
-    DIR *devicedir = NULL;
+    g_autoptr(DIR) devicedir = NULL;
     struct dirent *lun_dirent = NULL;
     char devicepattern[64];
     int found = 0;
@@ -4001,8 +3995,6 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool,
             found++;
     }
 
-    VIR_DIR_CLOSE(devicedir);
-
     if (retval < 0)
         return -1;
 

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index b1caf11f47e4ace32a8f9228e416f441dcfdcc72..6ba030bf9bbd0bf94cec48b4473628816f72bbbe 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -2303,7 +2303,7 @@ virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage)
 int
 virCgroupRemoveRecursively(char *grppath)
 {
-    DIR *grpdir;
+    g_autoptr(DIR) grpdir = NULL;
     struct dirent *ent;
     int rc = 0;
     int direrr;
@@ -2334,8 +2334,6 @@ virCgroupRemoveRecursively(char *grppath)
         VIR_ERROR(_("Failed to readdir for %s (%d)"), grppath, errno);
     }
 
-    VIR_DIR_CLOSE(grpdir);
-
     VIR_DEBUG("Removing cgroup %s", grppath);
     if (rmdir(grppath) != 0 && errno != ENOENT) {
         rc = -errno;
@@ -2471,7 +2469,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
     int rc;
     bool killedAny = false;
     g_autofree char *keypath = NULL;
-    DIR *dp = NULL;
+    g_autoptr(DIR) dp = NULL;
     struct dirent *ent;
     int direrr;
     VIR_DEBUG("group=%p path=%s signum=%d pids=%p",
@@ -2524,7 +2522,6 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
     ret = killedAny ? 1 : 0;
 
  cleanup:
-    VIR_DIR_CLOSE(dp);
     return ret;
 }
 

diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index 67b35c1b9ac19362058ecbf3c63b5cc210327e44..61fb359f8db58d2c5b09a85224574be681a3c3e5 100644 (file)
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -880,7 +880,7 @@ virCgroupV1SetOwner(virCgroupPtr cgroup,
     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
         g_autofree char *base = NULL;
         struct dirent *de;
-        DIR *dh = NULL;
+        g_autoptr(DIR) dh = NULL;
 
         if (!((1 << i) & controllers))
             continue;
@@ -915,8 +915,6 @@ virCgroupV1SetOwner(virCgroupPtr cgroup,
                                  base, uid, gid);
             goto cleanup;
         }
-
-        VIR_DIR_CLOSE(dh);
     }
 
     ret = 0;

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 6350e775235f8e35ce9eca9f20685d0f37d07b2b..5ae2ad9ef985e928a9fb0338f567f2808c5cc2f0 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -452,7 +452,7 @@ static int
 virCommandMassCloseGetFDsLinux(virCommandPtr cmd G_GNUC_UNUSED,
                                virBitmapPtr fds)
 {
-    DIR *dp = NULL;
+    g_autoptr(DIR) dp = NULL;
     struct dirent *entry;
     const char *dirName = "/proc/self/fd";
     int rc;
@@ -479,7 +479,6 @@ virCommandMassCloseGetFDsLinux(virCommandPtr cmd G_GNUC_UNUSED,
 
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dp);
     return ret;
 }
 

diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
index f26d36832a9a0d5dbcb8113c18126656fc61ca2d..323102d36e53e98eac2b114dadf09448b2916451 100644 (file)
--- a/src/util/virdevmapper.c
+++ b/src/util/virdevmapper.c
@@ -169,7 +169,7 @@ virDMSanitizepath(const char *path)
     g_autofree char *dmDirPath = NULL;
     struct dirent *ent = NULL;
     struct stat sb[2];
-    DIR *dh = NULL;
+    g_autoptr(DIR) dh = NULL;
     const char *p;
     char *ret = NULL;
 
@@ -211,7 +211,6 @@ virDMSanitizepath(const char *path)
         }
     }
 
-    VIR_DIR_CLOSE(dh);
     return ret;
 }
 

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 442d2fab96f91def44190f26dfad67c977844f40..fc0021036ab4cf5ad1ce84a4c587f4be192e1a11 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -669,7 +669,7 @@ static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd)
 static int virFileLoopDeviceOpenSearch(char **dev_name)
 {
     int fd = -1;
-    DIR *dh = NULL;
+    g_autoptr(DIR) dh = NULL;
     struct dirent *de;
     char *looppath = NULL;
     struct loop_info64 lo;
@@ -726,7 +726,6 @@ static int virFileLoopDeviceOpenSearch(char **dev_name)
         VIR_DEBUG("No free loop devices available");
         VIR_FREE(looppath);
     }
-    VIR_DIR_CLOSE(dh);
     return fd;
 }
 
@@ -836,7 +835,7 @@ virFileNBDDeviceIsBusy(const char *dev_name)
 static char *
 virFileNBDDeviceFindUnused(void)
 {
-    DIR *dh;
+    g_autoptr(DIR) dh = NULL;
     char *ret = NULL;
     struct dirent *de;
     int direrr;
@@ -861,7 +860,6 @@ virFileNBDDeviceFindUnused(void)
                          _("No free NBD devices"));
 
  cleanup:
-    VIR_DIR_CLOSE(dh);
     return ret;
 }
 
@@ -979,7 +977,7 @@ int virFileNBDDeviceAssociate(const char *file,
  */
 int virFileDeleteTree(const char *dir)
 {
-    DIR *dh;
+    g_autoptr(DIR) dh = NULL;
     struct dirent *de;
     int ret = -1;
     int direrr;
@@ -1028,7 +1026,6 @@ int virFileDeleteTree(const char *dir)
     ret = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(dh);
     return ret;
 }
 
@@ -2954,7 +2951,7 @@ int virFileChownFiles(const char *name,
     struct dirent *ent;
     int ret = -1;
     int direrr;
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
 
     if (virDirOpen(&dir, name) < 0)
         return -1;
@@ -2982,7 +2979,6 @@ int virFileChownFiles(const char *name,
     ret = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/src/util/virhook.c b/src/util/virhook.c
index 119ad1aae680bfce4332a6f3f0cc7e615b7d59ec..aad3e667d3ab510723a2d1a318c0012e03c1ff2c 100644 (file)
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -143,7 +143,7 @@ static int
 virHookCheck(int no, const char *driver)
 {
     int ret;
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     g_autofree char *path = NULL;
     g_autofree char *dir_path = NULL;
@@ -199,8 +199,6 @@ virHookCheck(int no, const char *driver)
         break;
     }
 
-    VIR_DIR_CLOSE(dir);
-
     return ret;
 }
 
@@ -341,7 +339,7 @@ virHookCall(int driver,
             char **output)
 {
     int ret, script_ret;
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     g_autofree char *path = NULL;
     g_autofree char *dir_path = NULL;
@@ -438,8 +436,6 @@ virHookCall(int driver,
         virStringListAdd(&entries, entry_path);
     }
 
-    VIR_DIR_CLOSE(dir);
-
     if (ret < 0)
         return -1;
 

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 4ae4dca0678a6040dc7511ec9af24a8f0a15cdde..c531d65f86ee42d33251b4a81195cb1018a6dc7a 100644 (file)
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -308,7 +308,7 @@ virHostCPUParseNode(const char *node,
 {
     int ret = -1;
     int processors = 0;
-    DIR *cpudir = NULL;
+    g_autoptr(DIR) cpudir = NULL;
     struct dirent *cpudirent = NULL;
     virBitmapPtr node_cpus_map = NULL;
     virBitmapPtr sockets_map = NULL;
@@ -443,7 +443,6 @@ virHostCPUParseNode(const char *node,
     ret = processors;
 
  cleanup:
-    VIR_DIR_CLOSE(cpudir);
     if (cores_maps)
         for (i = 0; i < sock_max; i++)
             virBitmapFree(cores_maps[i]);
@@ -611,7 +610,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
 {
     virBitmapPtr present_cpus_map = NULL;
     virBitmapPtr online_cpus_map = NULL;
-    DIR *nodedir = NULL;
+    g_autoptr(DIR) nodedir = NULL;
     struct dirent *nodedirent = NULL;
     int nodecpus, nodecores, nodesockets, nodethreads, offline = 0;
     int threads_per_subcore = 0;
@@ -772,7 +771,6 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
     ret = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(nodedir);
     virBitmapFree(present_cpus_map);
     virBitmapFree(online_cpus_map);
     VIR_FREE(sysfs_nodedir);

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 91b12fc13137a15a7e126302aaa2482174ba122f..256179c052fbf9c8b037ec38e199ce6999991957 100644 (file)
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -2898,7 +2898,7 @@ virNetDevRDMAFeature(const char *ifname,
 {
     g_autofree char *eth_devpath = NULL;
     g_autofree char *eth_res_buf = NULL;
-    DIR *dirp = NULL;
+    g_autoptr(DIR) dirp = NULL;
     struct dirent *dp;
     int ret = -1;
 
@@ -2934,7 +2934,6 @@ virNetDevRDMAFeature(const char *ifname,
     ret = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(dirp);
     return ret;
 }
 

diff --git a/src/util/virnuma.c b/src/util/virnuma.c
index 5d40d13977356693df7cfdd4156595647d1b4251..51a5d6e8a65f7573b4f01b5eaadea1d35afad69d 100644 (file)
--- a/src/util/virnuma.c
+++ b/src/util/virnuma.c
@@ -740,7 +740,7 @@ virNumaGetPages(int node,
                 size_t *npages)
 {
     int ret = -1;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     int direrr = 0;
     struct dirent *entry;
     unsigned int ntmp = 0;
@@ -854,7 +854,6 @@ virNumaGetPages(int node,
     *npages = ntmp;
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 1f679a7b45cbbb78ef3695456f1b85e9747787a8..b44208e05a7822d9c383a574710e81917d69a9b3 100644 (file)
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -432,7 +432,7 @@ virPCIDeviceIterDevices(virPCIDeviceIterPredicate predicate,
                         virPCIDevicePtr *matched,
                         void *data)
 {
-    DIR *dir;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     int ret = 0;
     int rc;
@@ -480,7 +480,6 @@ virPCIDeviceIterDevices(virPCIDeviceIterPredicate predicate,
             break;
         }
     }
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -1706,7 +1705,7 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev,
                             void *opaque)
 {
     g_autofree char *pcidir = NULL;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     int ret = -1;
     struct dirent *ent;
     int direrr;
@@ -1741,7 +1740,6 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev,
     ret = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -1757,7 +1755,7 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAddressPtr orig,
                                      void *opaque)
 {
     g_autofree char *groupPath = NULL;
-    DIR *groupDir = NULL;
+    g_autoptr(DIR) groupDir = NULL;
     int ret = -1;
     struct dirent *ent;
     int direrr;
@@ -1790,7 +1788,6 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAddressPtr orig,
     ret = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(groupDir);
     return ret;
 }
 
@@ -2388,7 +2385,7 @@ virPCIGetNetName(const char *device_link_sysfs_path,
     g_autofree char *pcidev_sysfs_net_path = NULL;
     g_autofree char *firstEntryName = NULL;
     int ret = -1;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry = NULL;
     size_t i = 0;
 
@@ -2461,7 +2458,6 @@ virPCIGetNetName(const char *device_link_sysfs_path,
         }
     }
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -2535,7 +2531,7 @@ virPCIGetMdevTypes(const char *sysfspath,
 {
     ssize_t ret = -1;
     int dirret = -1;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     g_autofree char *types_path = NULL;
     g_autoptr(virMediatedDeviceType) mdev_type = NULL;
@@ -2575,7 +2571,6 @@ virPCIGetMdevTypes(const char *sysfspath,
     for (i = 0; i < ntypes; i++)
         virMediatedDeviceTypeFree(mdev_types[i]);
     VIR_FREE(mdev_types);
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 37413796b3f604201c36759d7c44f4d280557844..dccfc2558e5bcbfddaf7347f8879bf2f5c9c0ccd 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -616,7 +616,7 @@ virProcessGetAffinity(pid_t pid G_GNUC_UNUSED)
 int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids)
 {
     int ret = -1;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     int value;
     struct dirent *ent;
     g_autofree char *taskPath = NULL;
@@ -647,7 +647,6 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids)
     ret = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     if (ret < 0)
         VIR_FREE(*pids);
     return ret;

diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 400c8e99817ac7255bf48c3cc8d5608784fd82ef..aa466592fcdfb616505d2523ed872fc7c481da58 100644 (file)
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -781,7 +781,7 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl)
 static int
 virResctrlGetInfo(virResctrlInfoPtr resctrl)
 {
-    DIR *dirp = NULL;
+    g_autoptr(DIR) dirp = NULL;
     int ret = -1;
 
     ret = virDirOpenIfExists(&dirp, SYSFS_RESCTRL_PATH "/info");
@@ -802,7 +802,6 @@ virResctrlGetInfo(virResctrlInfoPtr resctrl)
 
     ret = 0;
  cleanup:
-    VIR_DIR_CLOSE(dirp);
     return ret;
 }
 
@@ -1900,7 +1899,7 @@ virResctrlAllocGetUnused(virResctrlInfoPtr resctrl)
     virResctrlAllocPtr ret = NULL;
     virResctrlAllocPtr alloc = NULL;
     struct dirent *ent = NULL;
-    DIR *dirp = NULL;
+    g_autoptr(DIR) dirp = NULL;
     int rv = -1;
 
     if (virResctrlInfoIsEmpty(resctrl)) {
@@ -1947,7 +1946,6 @@ virResctrlAllocGetUnused(virResctrlInfoPtr resctrl)
 
  cleanup:
     virObjectUnref(alloc);
-    VIR_DIR_CLOSE(dirp);
     return ret;
 
  error:
@@ -2663,7 +2661,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor,
     int ret = -1;
     size_t i = 0;
     unsigned long long val = 0;
-    DIR *dirp = NULL;
+    g_autoptr(DIR) dirp = NULL;
     char *datapath = NULL;
     char *filepath = NULL;
     struct dirent *ent = NULL;
@@ -2747,7 +2745,6 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor,
     VIR_FREE(datapath);
     VIR_FREE(filepath);
     virResctrlMonitorStatsFree(stat);
-    VIR_DIR_CLOSE(dirp);
     return ret;
 }
 

diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index 4dcd68d53a58f45c654784a139d261bb69d84032..256acc37fafd68c857c14e48f27110bfab8c7b40 100644 (file)
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -106,7 +106,7 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix,
                        unsigned int target,
                        unsigned long long unit)
 {
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     g_autofree char *path = NULL;
     char *sg = NULL;
@@ -129,7 +129,6 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix,
     }
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return sg;
 }
 
@@ -143,7 +142,7 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
                         unsigned int target,
                         unsigned long long unit)
 {
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry;
     g_autofree char *path = NULL;
     char *name = NULL;
@@ -165,7 +164,6 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
     }
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return name;
 }
 

diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
index 7d8e5299b8b48f2c6d5c3bd89b36502040c9ef54..c259e630003a76dfafd8a997319fbde8557f4f7b 100644 (file)
--- a/src/util/virscsihost.c
+++ b/src/util/virscsihost.c
@@ -100,7 +100,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix,
 {
     const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH;
     struct dirent *entry = NULL;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     char *host_link = NULL;
     char *host_path = NULL;
     char *p = NULL;
@@ -157,7 +157,6 @@ virSCSIHostFindByPCI(const char *sysfs_prefix,
     }
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     VIR_FREE(unique_path);
     VIR_FREE(host_link);
     VIR_FREE(host_path);

diff --git a/src/util/virusb.c b/src/util/virusb.c
index 3e7e4281a340241960128464abbb1581131e603e..a8afd6e6f01d59ce50ca073421dc096145cb6ec5 100644 (file)
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -110,7 +110,7 @@ virUSBDeviceSearch(unsigned int vendor,
                    const char *vroot,
                    unsigned int flags)
 {
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     bool found = false;
     char *ignore = NULL;
     struct dirent *de;
@@ -180,7 +180,6 @@ virUSBDeviceSearch(unsigned int vendor,
     ret = list;
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     if (!ret)
         virObjectUnref(list);
     return ret;

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 708c3cf9ef9887ddc14fbf1559522426268f8769..41e92023fc7a4502e0c9d3b619c5e5a61cb8db17 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1621,7 +1621,7 @@ virMemoryMaxValue(bool capped)
 bool
 virHostHasIOMMU(void)
 {
-    DIR *iommuDir = NULL;
+    g_autoptr(DIR) iommuDir = NULL;
     struct dirent *iommuGroup = NULL;
     bool ret = false;
     int direrr;
@@ -1638,7 +1638,6 @@ virHostHasIOMMU(void)
     ret = true;
 
  cleanup:
-    VIR_DIR_CLOSE(iommuDir);
     return ret;
 }
 
@@ -1658,7 +1657,7 @@ char *
 virHostGetDRMRenderNode(void)
 {
     char *ret = NULL;
-    DIR *driDir = NULL;
+    g_autoptr(DIR) driDir = NULL;
     const char *driPath = "/dev/dri";
     struct dirent *ent = NULL;
     int dirErr = 0;
@@ -1687,7 +1686,6 @@ virHostGetDRMRenderNode(void)
     ret = g_strdup_printf("%s/%s", driPath, ent->d_name);
 
  cleanup:
-    VIR_DIR_CLOSE(driDir);
     return ret;
 }
 

diff --git a/src/util/virvhba.c b/src/util/virvhba.c
index df0691a6588bc428cfe6f6cfcf24981668378411..471d94d3dd0363ef183d12c0122df36d9849ddb3 100644 (file)
--- a/src/util/virvhba.c
+++ b/src/util/virvhba.c
@@ -158,7 +158,7 @@ char *
 virVHBAFindVportHost(const char *sysfs_prefix)
 {
     const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *entry = NULL;
     char *max_vports = NULL;
     char *vports = NULL;
@@ -220,7 +220,6 @@ virVHBAFindVportHost(const char *sysfs_prefix)
     }
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     VIR_FREE(max_vports);
     VIR_FREE(vports);
     return ret;
@@ -365,7 +364,7 @@ virVHBAGetHostByWWN(const char *sysfs_prefix,
 {
     const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH;
     struct dirent *entry = NULL;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     char *ret = NULL;
 
     if (virDirOpen(&dir, prefix) < 0)
@@ -393,7 +392,6 @@ virVHBAGetHostByWWN(const char *sysfs_prefix,
     }
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -411,7 +409,7 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix,
 {
     const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH;
     struct dirent *entry = NULL;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     char *vport_create_path = NULL;
     char *ret = NULL;
 
@@ -443,7 +441,6 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix,
     }
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     VIR_FREE(vport_create_path);
     return ret;
 }

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 278587767f2228bc4566738a3e92ef10685f43c6..5ae1d64337a96d805e0653b7e130f0027db0098b 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -510,7 +510,7 @@ testQemuGetLatestCapsForArch(const char *arch,
                              const char *suffix)
 {
     struct dirent *ent;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     int rc;
     g_autofree char *fullsuffix = NULL;
     unsigned long maxver = 0;
@@ -558,7 +558,6 @@ testQemuGetLatestCapsForArch(const char *arch,
     ret = g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname);
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -606,7 +605,7 @@ testQemuCapsIterate(const char *suffix,
                     void *opaque)
 {
     struct dirent *ent;
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     int rc;
     int ret = -1;
     bool fail = false;
@@ -667,7 +666,6 @@ testQemuCapsIterate(const char *suffix,
     ret = 0;
 
  cleanup:
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/tests/virschematest.c b/tests/virschematest.c
index 0e587c3ff06500b1433e230a152d24f260674294..9a947f61f2ec1b91c08e05983ff94be5924303b3 100644 (file)
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -86,7 +86,7 @@ testSchemaDir(const char *schema,
               const char *dir_path,
               const char *filterstr)
 {
-    DIR *dir = NULL;
+    g_autoptr(DIR) dir = NULL;
     struct dirent *ent;
     int ret = 0;
     int rc;
@@ -128,7 +128,6 @@ testSchemaDir(const char *schema,
         ret = -1;
     }
 
-    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index 61284ae4da825c283e026fe224c5f46106c6dc39..a10ac03293436e65d0831d94ecea9bdc1772d948 100644 (file)
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -374,7 +374,7 @@ int virHostValidateIOMMU(const char *hvname,
     } else if (ARCH_IS_PPC64(arch)) {
         /* Empty Block */
     } else if (ARCH_IS_S390(arch)) {
-        DIR *dir;
+        g_autoptr(DIR) dir = NULL;
 
         /* On s390x, we skip the IOMMU check if there are no PCI
          * devices (which is quite usual on s390x). If there are
@@ -383,7 +383,6 @@ int virHostValidateIOMMU(const char *hvname,
         if (!virDirOpen(&dir, "/sys/bus/pci/devices"))
             return 0;
         rc = virDirRead(dir, &dent, NULL);
-        VIR_DIR_CLOSE(dir);
         if (rc <= 0)
             return 0;
     } else {