2:13 p.m.
Ján Tomko (2):
udevConnectListAllInterfaces: initialize ret
udevConnectListAllInterfaces: delete pointless cleanup code
src/interface/interface_backend_udev.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
--
2.26.2
2:13 p.m.
New subject: [libvirt PATCH 1/2] udevConnectListAllInterfaces: initialize ret
Currently, ret is only used in the 'cleanup' section
and initialized right before the jump.
Switch to the customary initialization to -1 and only
leave in the 'ret = 0' statement on an empty list.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/interface/interface_backend_udev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/interface/interface_backend_udev.c
b/src/interface/interface_backend_udev.c
index ce007fd29e..31246dde74 100644
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -303,7 +303,7 @@ udevConnectListAllInterfaces(virConnectPtr conn,
int tmp_count;
int count = 0;
int status = 0;
- int ret;
+ int ret = -1;
virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1);
@@ -320,7 +320,6 @@ udevConnectListAllInterfaces(virConnectPtr conn,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to get list of %s interfaces on host"),
virUdevStatusString(status));
- ret = -1;
goto cleanup;
}
--
2.26.2
2:13 p.m.
New subject: [libvirt PATCH 2/2] udevConnectListAllInterfaces: delete pointless cleanup code
We only jump to cleanup before allocating any lists.
Drop the dead code.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/interface/interface_backend_udev.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/interface/interface_backend_udev.c
b/src/interface/interface_backend_udev.c
index 31246dde74..351584ddf3 100644
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -405,14 +405,6 @@ udevConnectListAllInterfaces(virConnectPtr conn,
if (enumerate)
udev_enumerate_unref(enumerate);
udev_unref(udev);
-
- if (ifaces) {
- for (tmp_count = 0; tmp_count < count; tmp_count++)
- virObjectUnref(ifaces_list[tmp_count]);
- }
-
- VIR_FREE(ifaces_list);
-
return ret;
}
--
2.26.2
4:09 p.m.
On 11/20/20 2:13 PM, Ján Tomko wrote:
Ján Tomko (2):
udevConnectListAllInterfaces: initialize ret
udevConnectListAllInterfaces: delete pointless cleanup code
src/interface/interface_backend_udev.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
1400
days inactive
1400
days old
3 comments
2 participants
participants (2)
-
Ján Tomko -
Michal Privoznik