[PATCH 10/25] qemuAgentMakeCommand: Refactor memory cleanup
Switch to using the 'g_auto*' helpers.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_agent.c | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 51cc00c618..4712aeb529 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1149,31 +1149,26 @@ static virJSONValuePtr G_GNUC_NULL_TERMINATED
qemuAgentMakeCommand(const char *cmdname,
...)
{
- virJSONValuePtr obj = virJSONValueNewObject();
- virJSONValuePtr jargs = NULL;
+ g_autoptr(virJSONValue) obj = NULL;
+ g_autoptr(virJSONValue) jargs = NULL;
va_list args;
va_start(args, cmdname);
- if (virJSONValueObjectAppendString(obj, "execute", cmdname) < 0)
- goto error;
-
- if (virJSONValueObjectCreateVArgs(&jargs, args) < 0)
- goto error;
-
- if (jargs &&
- virJSONValueObjectAppend(obj, "arguments", jargs) < 0)
- goto error;
+ if (virJSONValueObjectCreateVArgs(&jargs, args) < 0) {
+ va_end(args);
+ return NULL;
+ }
va_end(args);
- return obj;
+ if (virJSONValueObjectCreate(&obj,
+ "s:execute", cmdname,
+ "A:arguments", &jargs,
+ NULL) < 0)
+ return NULL;
- error:
- virJSONValueFree(obj);
- virJSONValueFree(jargs);
- va_end(args);
- return NULL;
+ return g_steal_pointer(&obj);
}
static virJSONValuePtr
--
2.29.2