From 9ad1e1d89739a31927a5f4ac70898b06f03f5e27 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 15 Feb 2021 17:19:10 +0100 Subject: [PATCH] qemu: Bring if() outside from loop in virDomainFSInfoFormat() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After previous commit, the freeing of @info_ret inside of virDomainFSInfoFormat() looks like this: for () { if (info_ret) virDomainFSInfoFree(info_ret[i]); } It is needless to compare @info_ret against NULL in each iteration. We can switch the order and do the comparison first followed by the loop. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 71c823abd0..d30cf75b73 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18977,13 +18977,14 @@ virDomainFSInfoFormat(qemuAgentFSInfoPtr *agentinfo, ret = nagentinfo; cleanup: - for (i = 0; i < nagentinfo; i++) { - /* if there was an error, free any memory we've allocated for the - * return value */ - if (info_ret) + if (info_ret) { + for (i = 0; i < nagentinfo; i++) { + /* if there was an error, free any memory we've allocated for the + * return value */ virDomainFSInfoFree(info_ret[i]); + } + g_free(info_ret); } - g_free(info_ret); return ret; }