[libvirt PATCH 15/15] cpu_ppc64: Use g_auto* in virCPUppc64DriverGetModels
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/cpu/cpu_ppc64.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index db59f5adbf..860e959900 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -734,33 +734,21 @@ virCPUppc64Baseline(virCPUDefPtr *cpus,
static int
virCPUppc64DriverGetModels(char ***models)
{
- ppc64_map *map;
+ g_autoptr(ppc64_map) map = NULL;
size_t i;
- int ret = -1;
if (!(map = ppc64LoadMap()))
- goto error;
+ return -1;
if (models) {
if (VIR_ALLOC_N(*models, map->nmodels + 1) < 0)
- goto error;
+ return -1;
for (i = 0; i < map->nmodels; i++)
(*models)[i] = g_strdup(map->models[i]->name);
}
- ret = map->nmodels;
-
- cleanup:
- ppc64MapFree(map);
- return ret;
-
- error:
- if (models) {
- g_strfreev(*models);
- *models = NULL;
- }
- goto cleanup;
+ return map->nmodels;
}
struct cpuArchDriver cpuDriverPPC64 = {
--
2.26.2