[libvirt PATCH] remote: DeserializeDomainDiskErrors: remove dead code

Ján Tomko posted 1 patch 4 months, 1 week ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/4de13898c09fd723987f182395d73753b117dfd1.1703000935.git.jtomko@redhat.com
src/remote/remote_driver.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
[libvirt PATCH] remote: DeserializeDomainDiskErrors: remove dead code
Posted by Ján Tomko 4 months, 1 week ago
As of commit b2d079c113a which converted this function to use g_strdup,
the error label is only reached when i = 0, rendering it useless.

Remove it.

Fixes: https://gitlab.com/libvirt/libvirt/-/issues/572
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 src/remote/remote_driver.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 132d0194c6..392377deae 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1641,12 +1641,11 @@ remoteDeserializeDomainDiskErrors(remote_domain_disk_error *ret_errors_val,
                                   int maxerrors)
 {
     size_t i = 0;
-    size_t j;
 
     if (ret_errors_len > limit || ret_errors_len > maxerrors) {
         virReportError(VIR_ERR_RPC, "%s",
                        _("returned number of disk errors exceeds limit"));
-        goto error;
+        return -1;
     }
 
     for (i = 0; i < ret_errors_len; i++) {
@@ -1655,12 +1654,6 @@ remoteDeserializeDomainDiskErrors(remote_domain_disk_error *ret_errors_val,
     }
 
     return 0;
-
- error:
-    for (j = 0; j < i; j++)
-        VIR_FREE(errors[j].disk);
-
-    return -1;
 }
 
 static int
-- 
2.42.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: [libvirt PATCH] remote: DeserializeDomainDiskErrors: remove dead code
Posted by Michal Prívozník 4 months, 1 week ago
On 12/19/23 16:48, Ján Tomko wrote:
> As of commit b2d079c113a which converted this function to use g_strdup,
> the error label is only reached when i = 0, rendering it useless.
> 
> Remove it.
> 
> Fixes: https://gitlab.com/libvirt/libvirt/-/issues/572
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  src/remote/remote_driver.c | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

Michal
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org