[PATCH 01/13] qemuMonitorJSONParsePropsList: Refactor cleanup
Use 'g_auto' for @proplist and remove @ret.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
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.31.1