On 1/22/19 8:26 PM, dann frazier wrote:
> From: Radoslaw Biernacki <radoslaw.biernacki@xxxxxxxxxx>
>
> Removing redundant sections of the code
>
> Signed-off-by: Radoslaw Biernacki <radoslaw.biernacki@xxxxxxxxxx>
> [ dannf: Add missing free of *pfname in error path and use proper < 0
> comparison when checking return for errors, both suggested by
> Michal Privoznik ]
> Signed-off-by: dann frazier <dann.frazier@xxxxxxxxxxxxx>
> ---
> src/util/virnetdev.c | 36 ++++++------------------------------
> 1 file changed, 6 insertions(+), 30 deletions(-)
>
> diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
> index 82823c0dfc..5571a10865 100644
> --- a/src/util/virnetdev.c
> +++ b/src/util/virnetdev.c
> @@ -1443,33 +1443,21 @@ int
> virNetDevGetVirtualFunctionInfo(const char *vfname, char **pfname,
> int *vf)
> {
> - char *pf_sysfs_path = NULL, *vf_sysfs_path = NULL;
> - int ret = -1;
> -
> + int ret;
> *pfname = NULL;
>
> if (virNetDevGetPhysicalFunction(vfname, pfname) < 0) {
> virReportError(VIR_ERR_INTERNAL_ERROR,
> _("Cannot get PF netdev name for VF %s"),
> vfname);
> - return ret;
> + return -1;
> }
>
> - if (virNetDevSysfsFile(&pf_sysfs_path, *pfname, "device") < 0)
> - goto cleanup;
> -
> - if (virNetDevSysfsFile(&vf_sysfs_path, vfname, "device") < 0)
> - goto cleanup;
> + ret = virNetDevGetVirtualFunctionIndex(*pfname, vfname, vf);
>
> - ret = virPCIGetVirtualFunctionIndex(pf_sysfs_path, vf_sysfs_path, vf);
> -
> - cleanup:
> if (ret < 0)
> VIR_FREE(*pfname);
>
> - VIR_FREE(vf_sysfs_path);
> - VIR_FREE(pf_sysfs_path);
> -
> return ret;
Nitpick, for better future extensibility I prefer initializing @ret,
keeping cleanup label and using goto cleanup.
ACK
Michal
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
