From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 10 Nov 2021 08:57:42 +0000 (+0100)
Subject: Use virNWFilterBindingObjEndAPI() more
X-Git-Tag: v7.10.0-rc1~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=375fb7d5768c8be5803d1c3e3b8943d6e758e307;p=thirdparty%2Flibvirt.git

Use virNWFilterBindingObjEndAPI() more

Instead of explicit virObjectUnlock(obj) + virObjectUnref(obj)
combo the virNWFilterBindingObjEndAPI() can be used.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 470a30ca90..212cca2265 100644
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -114,11 +114,8 @@ virNWFilterBindingObjListFindByPortDev(virNWFilterBindingObjList *bindings,
     obj = virNWFilterBindingObjListFindByPortDevLocked(bindings, name);
     virObjectRWUnlock(bindings);
 
-    if (obj && virNWFilterBindingObjGetRemoving(obj)) {
-        virObjectUnlock(obj);
-        virObjectUnref(obj);
-        obj = NULL;
-    }
+    if (obj && virNWFilterBindingObjGetRemoving(obj))
+        virNWFilterBindingObjEndAPI(&obj);
 
     return obj;
 }
@@ -407,8 +404,7 @@ virNWFilterBindingObjListFilter(virNWFilterBindingObj ***list,
          */
         if (virNWFilterBindingObjGetRemoving(binding) ||
             (filter && !filter(conn, def))) {
-            virObjectUnlock(binding);
-            virObjectUnref(binding);
+            virNWFilterBindingObjEndAPI(&binding);
             VIR_DELETE_ELEMENT(*list, i, *nbindings);
             continue;
         }