From 139338ab333a70232cb07cc563477db184dd2087 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 21 Oct 2021 12:52:14 +0200 Subject: [PATCH] qemu_monitor_json: Don't check for qemuMonitorNextCommandID() retval The qemuMonitorNextCommandID() function can never fail. There's no need to check for its retval then. Moreover, the temporary variable used to hold the retval can be declared in the inner most block. Signed-off-by: Michal Privoznik Reviewed-by: Tim Wiederhake --- src/qemu/qemu_monitor_json.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a7a980fccd..dcf9186191 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -302,15 +302,14 @@ qemuMonitorJSONCommandWithFd(qemuMonitor *mon, int ret = -1; qemuMonitorMessage msg; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; - char *id = NULL; *reply = NULL; memset(&msg, 0, sizeof(msg)); if (virJSONValueObjectHasKey(cmd, "execute") == 1) { - if (!(id = qemuMonitorNextCommandID(mon))) - goto cleanup; + g_autofree char *id = qemuMonitorNextCommandID(mon); + if (virJSONValueObjectAppendString(cmd, "id", id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to append command 'id' string")); @@ -339,7 +338,6 @@ qemuMonitorJSONCommandWithFd(qemuMonitor *mon, } cleanup: - VIR_FREE(id); VIR_FREE(msg.txBuffer); return ret; -- 2.47.2