From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 19 Aug 2020 11:17:06 +0000 (+0200)
Subject: qemuMigrationParamsFromJSON: Unify return value handling with other functions
X-Git-Tag: v6.7.0-rc1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2108c790c7a238d390406cb52ce87e18260ca94;p=thirdparty%2Flibvirt.git

qemuMigrationParamsFromJSON: Unify return value handling with other functions

This function doesn't have an overly verbose cleanup section as there
isn't any error code path. Unify it with the rest of the functions which
will simplify adding a possible error path.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 03d8d4fb49..3ed55c2ab4 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -670,7 +670,7 @@ qemuMigrationParamsDump(qemuMigrationParamsPtr migParams,
 qemuMigrationParamsPtr
 qemuMigrationParamsFromJSON(virJSONValuePtr params)
 {
-    qemuMigrationParamsPtr migParams;
+    g_autoptr(qemuMigrationParams) migParams = NULL;
     qemuMigrationParamValuePtr pv;
     const char *name;
     const char *str;
@@ -680,7 +680,7 @@ qemuMigrationParamsFromJSON(virJSONValuePtr params)
         return NULL;
 
     if (!params)
-        return migParams;
+        return g_steal_pointer(&migParams);
 
     for (i = 0; i < QEMU_MIGRATION_PARAM_LAST; i++) {
         name = qemuMigrationParamTypeToString(i);
@@ -711,7 +711,7 @@ qemuMigrationParamsFromJSON(virJSONValuePtr params)
         }
     }
 
-    return migParams;
+    return g_steal_pointer(&migParams);
 }