From nobody Sun May 19 06:23:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1703001034904328.11361569763596; Tue, 19 Dec 2023 07:50:34 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6843E1B9B; Tue, 19 Dec 2023 10:50:33 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C3B941B90; Tue, 19 Dec 2023 10:49:26 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B19521B8D; Tue, 19 Dec 2023 10:49:22 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8636617EA for ; Tue, 19 Dec 2023 10:49:21 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-19-Py_QodCnO2O81OUsQP--zA-1; Tue, 19 Dec 2023 10:49:18 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B4C543806738 for ; Tue, 19 Dec 2023 15:49:17 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55EF0C15968 for ; Tue, 19 Dec 2023 15:49:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: Py_QodCnO2O81OUsQP--zA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH] remote: DeserializeDomainDiskErrors: remove dead code Date: Tue, 19 Dec 2023 16:48:55 +0100 Message-ID: <4de13898c09fd723987f182395d73753b117dfd1.1703000935.git.jtomko@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: D5CZCGZG4YIBUVV2VH4OUVI5RRPLADLV X-Message-ID-Hash: D5CZCGZG4YIBUVV2VH4OUVI5RRPLADLV X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1703001036669100001 As of commit b2d079c113a which converted this function to use g_strdup, the error label is only reached when i =3D 0, rendering it useless. Remove it. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/572 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- 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_dis= k_error *ret_errors_val, int maxerrors) { size_t i =3D 0; - size_t j; =20 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; } =20 for (i =3D 0; i < ret_errors_len; i++) { @@ -1655,12 +1654,6 @@ remoteDeserializeDomainDiskErrors(remote_domain_disk= _error *ret_errors_val, } =20 return 0; - - error: - for (j =3D 0; j < i; j++) - VIR_FREE(errors[j].disk); - - return -1; } =20 static int --=20 2.42.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org