From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Mon, 24 Aug 2020 13:27:52 +0000 (-0300)
Subject: virhostcpu.c: modernize virHostCPUGetMicrocodeVersion()
X-Git-Tag: v6.7.0-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97ac16baabbb36ae75886529a95eca82149bb8da;p=thirdparty%2Flibvirt.git

virhostcpu.c: modernize virHostCPUGetMicrocodeVersion()

Use g_autofree and remove the cleanup label.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 6cea75536d..d7aa39c131 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -1241,7 +1241,7 @@ virHostCPUGetKVMMaxVCPUs(void)
 unsigned int
 virHostCPUGetMicrocodeVersion(void)
 {
-    char *outbuf = NULL;
+    g_autofree char *outbuf = NULL;
     char *cur;
     unsigned int version = 0;
 
@@ -1254,16 +1254,14 @@ virHostCPUGetMicrocodeVersion(void)
     /* Account for format 'microcode    : XXXX'*/
     if (!(cur = strstr(outbuf, "microcode")) ||
         !(cur = strchr(cur, ':')))
-        goto cleanup;
+        return 0;
     cur++;
 
     /* Linux places the microcode revision in a 32-bit integer, so
      * ui is fine for us too.  */
     if (virStrToLong_ui(cur, &cur, 0, &version) < 0)
-        goto cleanup;
+        return 0;
 
- cleanup:
-    VIR_FREE(outbuf);
     return version;
 }