mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
interface: use g_strdup instead of VIR_STRDUP
Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
07ef88935a
commit
2f3b7a5555
@ -251,17 +251,10 @@ netcfGetMinimalDefForDevice(struct netcf_if *iface)
|
|||||||
if (VIR_ALLOC(def) < 0)
|
if (VIR_ALLOC(def) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (VIR_STRDUP(def->name, ncf_if_name(iface)) < 0)
|
def->name = g_strdup(ncf_if_name(iface));
|
||||||
goto cleanup;
|
def->mac = g_strdup(ncf_if_mac_string(iface));
|
||||||
|
|
||||||
if (VIR_STRDUP(def->mac, ncf_if_mac_string(iface)) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
return def;
|
return def;
|
||||||
|
|
||||||
cleanup:
|
|
||||||
virInterfaceDefFree(def);
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -89,17 +89,10 @@ udevGetMinimalDefForDevice(struct udev_device *dev)
|
|||||||
if (VIR_ALLOC(def) < 0)
|
if (VIR_ALLOC(def) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (VIR_STRDUP(def->name, udev_device_get_sysname(dev)) < 0)
|
def->name = g_strdup(udev_device_get_sysname(dev));
|
||||||
goto cleanup;
|
def->mac = g_strdup(udev_device_get_sysattr_value(dev, "address"));
|
||||||
|
|
||||||
if (VIR_STRDUP(def->mac, udev_device_get_sysattr_value(dev, "address")) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
return def;
|
return def;
|
||||||
|
|
||||||
cleanup:
|
|
||||||
virInterfaceDefFree(def);
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -236,11 +229,7 @@ udevListInterfacesByStatus(virConnectPtr conn,
|
|||||||
|
|
||||||
def = udevGetMinimalDefForDevice(dev);
|
def = udevGetMinimalDefForDevice(dev);
|
||||||
if (filter(conn, def)) {
|
if (filter(conn, def)) {
|
||||||
if (VIR_STRDUP(names[count], udev_device_get_sysname(dev)) < 0) {
|
names[count] = g_strdup(udev_device_get_sysname(dev));
|
||||||
udev_device_unref(dev);
|
|
||||||
virInterfaceDefFree(def);
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
udev_device_unref(dev);
|
udev_device_unref(dev);
|
||||||
@ -755,8 +744,7 @@ udevGetIfaceDefBond(struct udev *udev,
|
|||||||
_("Could not retrieve 'bonding/arp_ip_target' for '%s'"), name);
|
_("Could not retrieve 'bonding/arp_ip_target' for '%s'"), name);
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
if (VIR_STRDUP(ifacedef->data.bond.target, tmp_str) < 0)
|
ifacedef->data.bond.target = g_strdup(tmp_str);
|
||||||
goto error;
|
|
||||||
|
|
||||||
/* Slaves of the bond */
|
/* Slaves of the bond */
|
||||||
/* Get each slave in the bond */
|
/* Get each slave in the bond */
|
||||||
@ -837,8 +825,7 @@ udevGetIfaceDefBridge(struct udev *udev,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (VIR_STRDUP(ifacedef->data.bridge.delay, tmp_str) < 0)
|
ifacedef->data.bridge.delay = g_strdup(tmp_str);
|
||||||
goto error;
|
|
||||||
|
|
||||||
/* Retrieve Spanning Tree State. Valid values = -1, 0, 1 */
|
/* Retrieve Spanning Tree State. Valid values = -1, 0, 1 */
|
||||||
tmp_str = udev_device_get_sysattr_value(dev, "bridge/stp_state");
|
tmp_str = udev_device_get_sysattr_value(dev, "bridge/stp_state");
|
||||||
@ -1001,8 +988,7 @@ udevGetIfaceDef(struct udev *udev, const char *name)
|
|||||||
|
|
||||||
/* Clear our structure and set safe defaults */
|
/* Clear our structure and set safe defaults */
|
||||||
ifacedef->startmode = VIR_INTERFACE_START_UNSPECIFIED;
|
ifacedef->startmode = VIR_INTERFACE_START_UNSPECIFIED;
|
||||||
if (VIR_STRDUP(ifacedef->name, name) < 0)
|
ifacedef->name = g_strdup(name);
|
||||||
goto error;
|
|
||||||
|
|
||||||
/* Lookup the device we've been asked about */
|
/* Lookup the device we've been asked about */
|
||||||
dev = udev_device_new_from_subsystem_sysname(udev, "net", name);
|
dev = udev_device_new_from_subsystem_sysname(udev, "net", name);
|
||||||
@ -1013,9 +999,7 @@ udevGetIfaceDef(struct udev *udev, const char *name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* MAC address */
|
/* MAC address */
|
||||||
if (VIR_STRDUP(ifacedef->mac,
|
ifacedef->mac = g_strdup(udev_device_get_sysattr_value(dev, "address"));
|
||||||
udev_device_get_sysattr_value(dev, "address")) < 0)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
/* Link state and speed */
|
/* Link state and speed */
|
||||||
if (virNetDevGetLinkInfo(ifacedef->name, &ifacedef->lnk) < 0)
|
if (virNetDevGetLinkInfo(ifacedef->name, &ifacedef->lnk) < 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user