External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

consistently use VIR_DIR_CLOSE() instead of virDirClose()

Browse Source 
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>
This commit is contained in:
Laine Stump 2020-10-13 09:40:54 -04:00
parent fafeed8bed
commit c40b673182
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_interop_config.c
View File

@ -79,7 +79,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir)
ret = 0; ret = 0;
cleanup: cleanup:
virDirClose(&dirp); VIR_DIR_CLOSE(dirp);
return ret; return ret;
} }

6
src/security/security_selinux.c
View File

@ -3487,8 +3487,7 @@ virSecuritySELinuxSetFileLabels(virSecurityManagerPtr mgr,
virReportSystemError(errno, _("Unable to label files under %s"), virReportSystemError(errno, _("Unable to label files under %s"),
path); path);
virDirClose(&dir); VIR_DIR_CLOSE(dir);
return ret; return ret;
} }
@ -3532,8 +3531,7 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManagerPtr mgr,
virReportSystemError(errno, _("Unable to restore file labels under %s"), virReportSystemError(errno, _("Unable to restore file labels under %s"),
path); path);
virDirClose(&dir); VIR_DIR_CLOSE(dir);
return ret; return ret;
} }

2
src/util/virdevmapper.c
View File

@ -211,7 +211,7 @@ virDMSanitizepath(const char *path)
} }
} }
virDirClose(&dh); VIR_DIR_CLOSE(dh);
return ret; return ret;
} }

3
src/util/virfile.c
View File

@ -2983,8 +2983,7 @@ int virFileChownFiles(const char *name,
ret = 0; ret = 0;
cleanup: cleanup:
virDirClose(&dir); VIR_DIR_CLOSE(dir);
return ret; return ret;
} }

5
tests/testutilsqemu.c
View File

@ -558,7 +558,7 @@ testQemuGetLatestCapsForArch(const char *arch,
ret = g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname); ret = g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname);
cleanup: cleanup:
virDirClose(&dir); VIR_DIR_CLOSE(dir);
return ret; return ret;
} }
@ -667,8 +667,7 @@ testQemuCapsIterate(const char *suffix,
ret = 0; ret = 0;
cleanup: cleanup:
virDirClose(&dir); VIR_DIR_CLOSE(dir);
return ret; return ret;
} }