From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 13 May 2020 09:49:37 +0000 (+0200)
Subject: virNetDevOpenvswitchGetVhostuserIfname: Drop cleanup label
X-Git-Tag: v6.4.0-rc1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d190efc85a9c1c407512de4707acb4ffbbc04a4;p=thirdparty%2Flibvirt.git

virNetDevOpenvswitchGetVhostuserIfname: Drop cleanup label

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index bc6a130035..dbb489d174 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -485,7 +485,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
 {
     const char *tmpIfname = NULL;
     int status;
-    int ret = -1;
     g_autoptr(virCommand) cmd = NULL;
 
     /* Openvswitch vhostuser path are hardcoded to
@@ -495,10 +494,8 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
      * so we pick the filename and check it's a openvswitch interface
      */
     if (!path ||
-        !(tmpIfname = strrchr(path, '/'))) {
-        ret = 0;
-        goto cleanup;
-    }
+        !(tmpIfname = strrchr(path, '/')))
+        return 0;
 
     tmpIfname++;
     cmd = virCommandNew(OVSVSCTL);
@@ -507,15 +504,11 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
     if (virCommandRun(cmd, &status) < 0 ||
         status) {
         /* it's not a openvswitch vhostuser interface. */
-        ret = 0;
-        goto cleanup;
+        return 0;
     }
 
     *ifname = g_strdup(tmpIfname);
-    ret = 1;
-
- cleanup:
-    return ret;
+    return 1;
 }
 
 /**