[libvirt] [PATCH v5 02/20] qemu: clean up qemuDomainRemoveInactiveCommon
Use VIR_AUTOFREE and saner formatting. No semantic change.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/qemu/qemu_domain.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 68298ad4e8..e243c07168 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8652,8 +8652,8 @@ static void
qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver,
virDomainObjPtr vm)
{
- char *snapDir;
virQEMUDriverConfigPtr cfg;
+ VIR_AUTOFREE(char *) snapDir = NULL;
cfg = virQEMUDriverGetConfig(driver);
@@ -8661,15 +8661,12 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver,
if (qemuDomainSnapshotDiscardAllMetadata(driver, vm) < 0) {
VIR_WARN("unable to remove all snapshots for domain %s",
vm->def->name);
- }
- else if (virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir,
- vm->def->name) < 0) {
+ } else if (virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir,
+ vm->def->name) < 0) {
VIR_WARN("unable to remove snapshot directory %s/%s",
cfg->snapshotDir, vm->def->name);
- } else {
- if (rmdir(snapDir) < 0 && errno != ENOENT)
- VIR_WARN("unable to remove snapshot directory %s", snapDir);
- VIR_FREE(snapDir);
+ } else if (rmdir(snapDir) < 0 && errno != ENOENT) {
+ VIR_WARN("unable to remove snapshot directory %s", snapDir);
}
qemuExtDevicesCleanupHost(driver, vm->def);
--
2.20.1