consistently use VIR_DIR_CLOSE() instead of virDirClose()

This will make it easier to review upcoming patches that use g_autoptr
to auto-close all DIRs.

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

diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c
index 53b251f0562819bc4c8a9913534d38dd454765d4..7edca7540a7c36345128814cc2c07e3b06e408d9 100644 (file)
--- a/src/qemu/qemu_interop_config.c
+++ b/src/qemu/qemu_interop_config.c
@@ -79,7 +79,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir)
 
     ret = 0;
  cleanup:
-    virDirClose(&dirp);
+    VIR_DIR_CLOSE(dirp);
     return ret;
 }
 

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 733bcf23d9751189424c392f6e9341d890b3141e..7d9e62a23922932588d1b05168be5df0432075ff 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -3487,8 +3487,7 @@ virSecuritySELinuxSetFileLabels(virSecurityManagerPtr mgr,
         virReportSystemError(errno, _("Unable to label files under %s"),
                              path);
 
-    virDirClose(&dir);
-
+    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -3532,8 +3531,7 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManagerPtr mgr,
         virReportSystemError(errno, _("Unable to restore file labels under %s"),
                              path);
 
-    virDirClose(&dir);
-
+    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
index 4d27c9f10452ba93f492d5e8d2c2f0a9025717e4..f26d36832a9a0d5dbcb8113c18126656fc61ca2d 100644 (file)
--- a/src/util/virdevmapper.c
+++ b/src/util/virdevmapper.c
@@ -211,7 +211,7 @@ virDMSanitizepath(const char *path)
         }
     }
 
-    virDirClose(&dh);
+    VIR_DIR_CLOSE(dh);
     return ret;
 }
 

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 7d0a40b0fb7fc75af2e80e9fc6e834ae65d970e1..970d4bd234d515f1249662a5e12c0049dc0d6760 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -2983,8 +2983,7 @@ int virFileChownFiles(const char *name,
     ret = 0;
 
  cleanup:
-    virDirClose(&dir);
-
+    VIR_DIR_CLOSE(dir);
     return ret;
 }
 

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 4defba0b7b5d1ecbd2b9c028b40c6e99e7893be1..278587767f2228bc4566738a3e92ef10685f43c6 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -558,7 +558,7 @@ testQemuGetLatestCapsForArch(const char *arch,
     ret = g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname);
 
  cleanup:
-    virDirClose(&dir);
+    VIR_DIR_CLOSE(dir);
     return ret;
 }
 
@@ -667,8 +667,7 @@ testQemuCapsIterate(const char *suffix,
     ret = 0;
 
  cleanup:
-    virDirClose(&dir);
-
+    VIR_DIR_CLOSE(dir);
     return ret;
 }