]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Bring if() outside from loop in virDomainFSInfoFormat()
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 15 Feb 2021 16:19:10 +0000 (17:19 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 16 Feb 2021 13:06:31 +0000 (14:06 +0100)
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 <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_driver.c

index 71c823abd0be7a2fd1a2c769abd026704740be22..d30cf75b73c9f8429b23ccdfb20fee6e3c6568ae 100644 (file)
@@ -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;
 }