[PATCH 06/12] qemuAgentGetHostname: Refactor to remove cleanup section
Use g_autoptr instead.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_agent.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index c55b989467..07aba2b45d 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1720,44 +1720,36 @@ int
qemuAgentGetHostname(qemuAgentPtr agent,
char **hostname)
{
- int ret = -1;
- virJSONValuePtr cmd;
- virJSONValuePtr reply = NULL;
+ g_autoptr(virJSONValue) cmd = qemuAgentMakeCommand("guest-get-host-name",
NULL);
+ g_autoptr(virJSONValue) reply = NULL;
virJSONValuePtr data = NULL;
const char *result = NULL;
- cmd = qemuAgentMakeCommand("guest-get-host-name",
- NULL);
-
if (!cmd)
- return ret;
+ return -1;
if (qemuAgentCommand(agent, cmd, &reply, agent->timeout) < 0) {
if (qemuAgentErrorCommandUnsupported(reply))
- ret = -2;
- goto cleanup;
+ return -2;
+
+ return -1;
}
if (!(data = virJSONValueObjectGet(reply, "return"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed return value"));
- goto cleanup;
+ return -1;
}
if (!(result = virJSONValueObjectGetString(data, "host-name"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("'host-name' missing in guest-get-host-name
reply"));
- goto cleanup;
+ return -1;
}
*hostname = g_strdup(result);
- ret = 0;
-
- cleanup:
- virJSONValueFree(cmd);
- virJSONValueFree(reply);
- return ret;
+ return 0;
}
--
2.24.1