mirror of https://gitee.com/openkylin/libvirt.git
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>
This commit is contained in:
parent
fafeed8bed
commit
c40b673182
|
@ -79,7 +79,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir)
|
|||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
virDirClose(&dirp);
|
||||
VIR_DIR_CLOSE(dirp);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -211,7 +211,7 @@ virDMSanitizepath(const char *path)
|
|||
}
|
||||
}
|
||||
|
||||
virDirClose(&dh);
|
||||
VIR_DIR_CLOSE(dh);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -2983,8 +2983,7 @@ int virFileChownFiles(const char *name,
|
|||
ret = 0;
|
||||
|
||||
cleanup:
|
||||
virDirClose(&dir);
|
||||
|
||||
VIR_DIR_CLOSE(dir);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue