]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
interface_backend_udev: refactor udevListInterfacesByStatus
authorPavel Hrdina <phrdina@redhat.com>
Mon, 16 Nov 2020 13:48:10 +0000 (14:48 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Mon, 16 Nov 2020 16:14:17 +0000 (17:14 +0100)
Commit <2f3b7a5555c4cf4127ff3f8e00746eafcc91432c> replaced VIR_STRDUP
by g_strdup which made the error: path mostly useless.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
src/interface/interface_backend_udev.c

index 4e0a80765cd6630405d25ce160786e59cff03898..ce007fd29e68e4d889fe3cbb04388336c7a3fbeb 100644 (file)
@@ -204,7 +204,8 @@ udevListInterfacesByStatus(virConnectPtr conn,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("failed to get list of %s interfaces on host"),
                        virUdevStatusString(status));
-        goto error;
+        udev_unref(udev);
+        return -1;
     }
 
     /* Do the scan to load up the enumeration */
@@ -239,16 +240,6 @@ udevListInterfacesByStatus(virConnectPtr conn,
     udev_unref(udev);
 
     return count;
-
- error:
-    if (enumerate)
-        udev_enumerate_unref(enumerate);
-    udev_unref(udev);
-
-    for (names_len = 0; names_len < count; names_len++)
-        VIR_FREE(names[names_len]);
-
-    return -1;
 }
 
 static int