From 1149a6ddc7e73c6a6506d3ae9d09da85fe2108d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Wed, 22 Sep 2021 22:49:27 +0200 Subject: [PATCH] ch: use g_auto in virCHMonitorBuildDisksJson MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ján Tomko Reviewed-by: Laine Stump --- src/ch/ch_monitor.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 3ef2c3fb15..4ed31ec2ed 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -222,7 +222,7 @@ virCHMonitorBuildDiskJson(virJSONValue *disks, virDomainDiskDef *diskdef) static int virCHMonitorBuildDisksJson(virJSONValue *content, virDomainDef *vmdef) { - virJSONValue *disks; + g_autoptr(virJSONValue) disks = NULL; size_t i; if (vmdef->ndisks > 0) { @@ -230,17 +230,13 @@ virCHMonitorBuildDisksJson(virJSONValue *content, virDomainDef *vmdef) for (i = 0; i < vmdef->ndisks; i++) { if (virCHMonitorBuildDiskJson(disks, vmdef->disks[i]) < 0) - goto cleanup; + return -1; } if (virJSONValueObjectAppend(content, "disks", &disks) < 0) - goto cleanup; + return -1; } return 0; - - cleanup: - virJSONValueFree(disks); - return -1; } static int -- 2.47.2