From b4085809608541f4af5dc9a2a52d4328783c8101 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 14 Jun 2021 10:24:25 +0200 Subject: [PATCH] qemuMonitorJSONParsePropsList: Refactor cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use 'g_auto' for @proplist and remove @ret. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_monitor_json.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 46aa3330a8..3e7a61c52c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6615,14 +6615,13 @@ qemuMonitorJSONParsePropsList(virJSONValue *cmd, char ***props) { virJSONValue *data; - char **proplist = NULL; + g_auto(GStrv) proplist = NULL; size_t n = 0; size_t count = 0; size_t i; - int ret = -1; if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) - goto cleanup; + return -1; data = virJSONValueObjectGetArray(reply, "return"); n = virJSONValueArraySize(data); @@ -6641,18 +6640,14 @@ qemuMonitorJSONParsePropsList(virJSONValue *cmd, if (!(tmp = virJSONValueObjectGetString(child, "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("reply data was missing 'name'")); - goto cleanup; + return -1; } proplist[count++] = g_strdup(tmp); } - ret = count; *props = g_steal_pointer(&proplist); - - cleanup: - g_strfreev(proplist); - return ret; + return count; } -- 2.47.2