]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virnetworkobj: Drop needless cleanup label in virNetworkObjAddPort
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 9 Jul 2019 14:51:43 +0000 (16:51 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 12 Jul 2019 14:25:57 +0000 (16:25 +0200)
The cleanup label in virNetworkObjAddPort() function serves no
purpose. Drop it and thus simplify the function a bit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
src/conf/virnetworkobj.c

index 45726e40162968943d02acc4f7bd8c29608ad416..37580b4e7630374c3432986fa2d58e644f8b81d1 100644 (file)
@@ -1625,7 +1625,6 @@ virNetworkObjAddPort(virNetworkObjPtr net,
                      virNetworkPortDefPtr portdef,
                      const char *stateDir)
 {
-    int ret = -1;
     char uuidstr[VIR_UUID_STRING_BUFLEN];
     VIR_AUTOFREE(char *) dir = NULL;
 
@@ -1635,24 +1634,21 @@ virNetworkObjAddPort(virNetworkObjPtr net,
         virReportError(VIR_ERR_NETWORK_PORT_EXIST,
                        _("Network port with UUID %s already exists"),
                        uuidstr);
-        goto cleanup;
+        return -1;
     }
 
     if (!(dir = virNetworkObjGetPortStatusDir(net, stateDir)))
-        goto cleanup;
+        return -1;
 
     if (virHashAddEntry(net->ports, uuidstr, portdef) < 0)
-        goto cleanup;
+        return -1;
 
     if (virNetworkPortDefSaveStatus(portdef, dir) < 0) {
         virHashRemoveEntry(net->ports, uuidstr);
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
-
- cleanup:
-    return ret;
+    return 0;
 }