From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 8 Nov 2021 10:17:09 +0000 (+0100)
Subject: virNetworkEventDispatchDefaultFunc: Cleanup
X-Git-Tag: v7.10.0-rc1~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bea22ecfe2f0b471ae9562b89f4aad7af79986d8;p=thirdparty%2Flibvirt.git

virNetworkEventDispatchDefaultFunc: Cleanup

Remove unnecessary label and goto.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/network_event.c b/src/conf/network_event.c
index a47bf4dd3e..6f25e43711 100644
--- a/src/conf/network_event.c
+++ b/src/conf/network_event.c
@@ -86,8 +86,9 @@ virNetworkEventDispatchDefaultFunc(virConnectPtr conn,
                                    virConnectObjectEventGenericCallback cb,
                                    void *cbopaque)
 {
-    virNetworkPtr net = virGetNetwork(conn, event->meta.name, event->meta.uuid);
-    if (!net)
+    g_autoptr(virNetwork) net = NULL;
+
+    if (!(net = virGetNetwork(conn, event->meta.name, event->meta.uuid)))
         return;
 
     switch ((virNetworkEventID)event->eventID) {
@@ -100,16 +101,13 @@ virNetworkEventDispatchDefaultFunc(virConnectPtr conn,
                                                           networkLifecycleEvent->type,
                                                           networkLifecycleEvent->detail,
                                                           cbopaque);
-            goto cleanup;
+            return;
         }
 
     case VIR_NETWORK_EVENT_ID_LAST:
         break;
     }
     VIR_WARN("Unexpected event ID %d", event->eventID);
-
- cleanup:
-    virObjectUnref(net);
 }