From 3c650a8f7a89046b925fb5ddc78c4b6669ed76ef Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Wed, 25 Mar 2020 14:52:01 +0100 Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86LoadMap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- src/cpu/cpu_x86.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 983730f0c2..c41c7da594 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1559,18 +1559,14 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Map, x86MapFree); static virCPUx86MapPtr virCPUx86LoadMap(void) { - virCPUx86MapPtr map; + g_autoptr(virCPUx86Map) map = NULL; map = g_new0(virCPUx86Map, 1); if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0) - goto error; + return NULL; - return map; - - error: - x86MapFree(map); - return NULL; + return g_steal_pointer(&map); }