From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 24 May 2019 14:35:43 +0000 (+0200)
Subject: virStoragePoolObjListAdd: Separate out definition assignment
X-Git-Tag: v5.7.0-rc1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc281fec0fa5fd9bbef85b7df3905c10472fef0e;p=thirdparty%2Flibvirt.git

virStoragePoolObjListAdd: Separate out definition assignment

Separate storage pool definition assignment into a function.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 7c86ec529f..08441fcf4b 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -1505,6 +1505,21 @@ virStoragePoolObjSourceFindDuplicate(virStoragePoolObjListPtr pools,
 }
 
 
+static void
+virStoragePoolObjAssignDef(virStoragePoolObjPtr obj,
+                           virStoragePoolDefPtr def,
+                           unsigned int flgs ATTRIBUTE_UNUSED)
+{
+    if (!virStoragePoolObjIsActive(obj)) {
+        virStoragePoolDefFree(obj->def);
+        obj->def = def;
+    } else {
+        virStoragePoolDefFree(obj->newDef);
+        obj->newDef = def;
+    }
+}
+
+
 /**
  * virStoragePoolObjListAdd:
  * @pools: Storage Pool object list pointer
@@ -1540,13 +1555,7 @@ virStoragePoolObjListAdd(virStoragePoolObjListPtr pools,
     if (rc < 0)
         goto error;
     if (rc > 0) {
-        if (!virStoragePoolObjIsActive(obj)) {
-            virStoragePoolDefFree(obj->def);
-            obj->def = def;
-        } else {
-            virStoragePoolDefFree(obj->newDef);
-            obj->newDef = def;
-        }
+        virStoragePoolObjAssignDef(obj, def, flags);
         virObjectRWUnlock(pools);
         return obj;
     }