Adapt to VIR_ALLOC and virAsprintf in src/interface/*

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index 760540ab6307b060066bb5572688a75d5abfddd5..6b244208639e81814ca953f0e781366de2e13008 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -65,10 +65,8 @@ netcfGetMinimalDefForDevice(struct netcf_if *iface)
     virInterfaceDef *def;
 
     /* Allocate our interface definition structure */
-    if (VIR_ALLOC(def) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(def) < 0)
         return NULL;
-    }
 
     if (VIR_STRDUP(def->name, ncf_if_name(iface)) < 0)
         goto cleanup;
@@ -157,10 +155,7 @@ static virDrvOpenStatus netcfInterfaceOpen(virConnectPtr conn,
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
     if (VIR_ALLOC(driverState) < 0)
-    {
-        virReportOOMError();
         goto alloc_error;
-    }
 
     /* initialize non-0 stuff in driverState */
     if (virMutexInit(&driverState->lock) < 0)
@@ -239,10 +234,8 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn,
         goto cleanup;
     }
 
-    if (VIR_ALLOC_N(names, count) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC_N(names, count) < 0)
         goto cleanup;
-    }
 
     if ((count = ncf_list_interfaces(driver->netcf, count, names, status)) < 0) {
         const char *errmsg, *details;
@@ -332,10 +325,8 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn,
         goto cleanup;
     }
 
-    if (VIR_ALLOC_N(allnames, count) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC_N(allnames, count) < 0)
         goto cleanup;
-    }
 
     if ((count = ncf_list_interfaces(driver->netcf, count, allnames, status)) < 0) {
         const char *errmsg, *details;
@@ -519,10 +510,8 @@ netcfConnectListAllInterfaces(virConnectPtr conn,
         goto cleanup;
     }
 
-    if (VIR_ALLOC_N(names, count) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC_N(names, count) < 0)
         goto cleanup;
-    }
 
     if ((count = ncf_list_interfaces(driver->netcf, count, names,
                                      NETCF_IFACE_ACTIVE |
@@ -536,12 +525,8 @@ netcfConnectListAllInterfaces(virConnectPtr conn,
         goto cleanup;
     }
 
-    if (ifaces) {
-        if (VIR_ALLOC_N(tmp_iface_objs, count + 1) < 0) {
-            virReportOOMError();
-            goto cleanup;
-        }
-    }
+    if (ifaces && VIR_ALLOC_N(tmp_iface_objs, count + 1) < 0)
+        goto cleanup;
 
     for (i = 0; i < count; i++) {
         virInterfaceDefPtr def;

diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
index 6270c9dc170d8e4d3f9af6d41d64c12e5afc6e13..f78e616140719575caacee588cb2a0f91ee549ec 100644 (file)
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -73,10 +73,8 @@ udevGetMinimalDefForDevice(struct udev_device *dev)
     virInterfaceDef *def;
 
     /* Allocate our interface definition structure */
-    if (VIR_ALLOC(def) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(def) < 0)
         return NULL;
-    }
 
     if (VIR_STRDUP(def->name, udev_device_get_sysname(dev)) < 0)
         goto cleanup;
@@ -141,10 +139,8 @@ udevInterfaceOpen(virConnectPtr conn,
 
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
-    if (VIR_ALLOC(driverState) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(driverState) < 0)
         goto cleanup;
-    }
 
     driverState->udev = udev_new();
     if (!driverState->udev) {
@@ -403,12 +399,9 @@ udevConnectListAllInterfaces(virConnectPtr conn,
     }
 
     /* If we're asked for the ifaces then alloc up memory */
-    if (ifaces) {
-        if (VIR_ALLOC_N(ifaces_list, count + 1) < 0) {
-            virReportOOMError();
-            ret = -1;
-            goto cleanup;
-        }
+    if (ifaces && VIR_ALLOC_N(ifaces_list, count + 1) < 0) {
+        ret = -1;
+        goto cleanup;
     }
 
     /* Get a list we can walk */
@@ -815,10 +808,8 @@ udevGetIfaceDefBond(struct udev *udev,
     }
 
     /* Allocate our list of slave devices */
-    if (VIR_ALLOC_N(ifacedef->data.bond.itf, slave_count) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC_N(ifacedef->data.bond.itf, slave_count) < 0)
         goto error;
-    }
     ifacedef->data.bond.nbItf = slave_count;
 
     for (i = 0; i < slave_count; i++) {
@@ -918,10 +909,8 @@ udevGetIfaceDefBridge(struct udev *udev,
 
     /* Members of the bridge */
     if (virAsprintf(&member_path, "%s/%s",
-                udev_device_get_syspath(dev), "brif") < 0) {
-        virReportOOMError();
+                udev_device_get_syspath(dev), "brif") < 0)
         goto error;
-    }
 
     /* Get each member of the bridge */
     member_count = scandir(member_path, &member_list,
@@ -938,10 +927,8 @@ udevGetIfaceDefBridge(struct udev *udev,
     }
 
     /* Allocate our list of member devices */
-    if (VIR_ALLOC_N(ifacedef->data.bridge.itf, member_count) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC_N(ifacedef->data.bridge.itf, member_count) < 0)
         goto error;
-    }
     ifacedef->data.bridge.nbItf = member_count;
 
     /* Get the interface defintions for each member of the bridge */
@@ -1016,10 +1003,8 @@ udevGetIfaceDef(struct udev *udev, const char *name)
     const char *devtype;
 
     /* Allocate our interface definition structure */
-    if (VIR_ALLOC(ifacedef) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(ifacedef) < 0)
         return NULL;
-    }
 
     /* Clear our structure and set safe defaults */
     ifacedef->startmode = VIR_INTERFACE_START_UNSPECIFIED;