From 0b236a92602cd260143f2c6a99ca22fcfabe2820 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 12 Feb 2021 11:51:59 +0100 Subject: [PATCH] qemuMonitorJSONTransactionAdd: Refactor cleanup Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_monitor_json.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 72af979d1a..b2034b3a40 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -510,31 +510,28 @@ qemuMonitorJSONTransactionAdd(virJSONValuePtr actions, const char *cmdname, ...) { - virJSONValuePtr entry = NULL; - virJSONValuePtr data = NULL; + g_autoptr(virJSONValue) entry = NULL; + g_autoptr(virJSONValue) data = NULL; va_list args; - int ret = -1; va_start(args, cmdname); - if (virJSONValueObjectCreateVArgs(&data, args) < 0) - goto cleanup; + if (virJSONValueObjectCreateVArgs(&data, args) < 0) { + va_end(args); + return -1; + } + + va_end(args); if (virJSONValueObjectCreate(&entry, "s:type", cmdname, "A:data", &data, NULL) < 0) - goto cleanup; + return -1; if (virJSONValueArrayAppend(actions, &entry) < 0) - goto cleanup; + return -1; - ret = 0; - - cleanup: - virJSONValueFree(entry); - virJSONValueFree(data); - va_end(args); - return ret; + return 0; }