From 3b559a7778dbe2b061cadabb25f06ef97d5711db Mon Sep 17 00:00:00 2001
From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 6 Jul 2021 13:38:53 +0200
Subject: [PATCH] virSystemdActivationNew: Remove superfluous `goto`s

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/util/virsystemd.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index f90c17e767..99c92b6f52 100644
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -968,17 +968,14 @@ virSystemdActivationNew(virSystemdActivationMap *map,
     fdnames = getenv("LISTEN_FDNAMES");
     if (fdnames) {
         if (virSystemdActivationInitFromNames(act, nfds, fdnames) < 0)
-            goto error;
+            return NULL;
     } else {
         if (virSystemdActivationInitFromMap(act, nfds, map, nmap) < 0)
-            goto error;
+            return NULL;
     }
 
     VIR_DEBUG("Created activation object for %d FDs", nfds);
     return g_steal_pointer(&act);
-
- error:
-    return NULL;
 }