shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 21:47:16 +03:00
Code Releases Activity

util: avoid manual VIR_FREE of a g_autofree pointer in virPCIGetName()

Browse Source 
thisPhysPortID is only used inside a conditional, so reduce its scope
to just the body of that conditional, which will eliminate the need
for the undesirable manual VIR_FREE().

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Laine Stump 2020-10-10 22:56:23 -04:00
parent bc7c4f5415
commit fefd478644
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/virpci.c
View File

@ -2408,7 +2408,6 @@ virPCIGetNetName(const char *device_link_sysfs_path,
{ {
g_autofree char *pcidev_sysfs_net_path = NULL; g_autofree char *pcidev_sysfs_net_path = NULL;
g_autofree char *firstEntryName = NULL; g_autofree char *firstEntryName = NULL;
g_autofree char *thisPhysPortID = NULL;
int ret = -1; int ret = -1;
DIR *dir = NULL; DIR *dir = NULL;
struct dirent *entry = NULL; struct dirent *entry = NULL;
@ -2433,12 +2432,13 @@ virPCIGetNetName(const char *device_link_sysfs_path,
* physportID of this netdev. If not, look for entry[idx]. * physportID of this netdev. If not, look for entry[idx].
*/ */
if (physPortID) { if (physPortID) {
g_autofree char *thisPhysPortID = NULL;
if (virNetDevGetPhysPortID(entry->d_name, &thisPhysPortID) < 0) if (virNetDevGetPhysPortID(entry->d_name, &thisPhysPortID) < 0)
goto cleanup; goto cleanup;
/* if this one doesn't match, keep looking */ /* if this one doesn't match, keep looking */
if (STRNEQ_NULLABLE(physPortID, thisPhysPortID)) { if (STRNEQ_NULLABLE(physPortID, thisPhysPortID)) {
VIR_FREE(thisPhysPortID);
/* save the first entry we find to use as a failsafe /* save the first entry we find to use as a failsafe
* in case we don't match the phys_port_id. This is * in case we don't match the phys_port_id. This is
* needed because some NIC drivers (e.g. i40e) * needed because some NIC drivers (e.g. i40e)