From nobody Mon Sep 16 19:52:45 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 1706635921672566.0179622563418; Tue, 30 Jan 2024 09:32:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 705D91D5F; Tue, 30 Jan 2024 12:32:00 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 11B891D4B; Tue, 30 Jan 2024 12:10:16 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3E25F1D26; Tue, 30 Jan 2024 12:09:35 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 541331D07 for ; Tue, 30 Jan 2024 12:08:27 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-182-gvt4KEnCNx2vxuSAQWmdtg-1; Tue, 30 Jan 2024 12:08:25 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 C00D685A58B for ; Tue, 30 Jan 2024 17:08:24 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38DE02166B31 for ; Tue, 30 Jan 2024 17:08:24 +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_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: gvt4KEnCNx2vxuSAQWmdtg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 14/31] util: virpcivpd: Remove return value from virPCIVPDResourceCustomUpsertValue Date: Tue, 30 Jan 2024 18:07:52 +0100 Message-ID: <0de49962bb2f9fe1a02c22a289fb7744bb6e91d0.1706633776.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: K7OZTRRDPLHAEPSSQ6SBL4GLXDNA55CQ X-Message-ID-Hash: K7OZTRRDPLHAEPSSQ6SBL4GLXDNA55CQ X-MailFrom: pkrempa@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: 1706635923832100001 None of the callers pass NULL, so the NULL check is pointless. Remove it an remove the return value. The function is exported only for use in 'virpcivpdtest' thus marking the arguments as NONNULL is unnecessary. Signed-off-by: Peter Krempa --- src/util/virpcivpd.c | 18 ++++-------------- src/util/virpcivpdpriv.h | 2 +- tests/virpcivpdtest.c | 12 ++++-------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c index 67065dec46..f198faaf42 100644 --- a/src/util/virpcivpd.c +++ b/src/util/virpcivpd.c @@ -270,7 +270,7 @@ virPCIVPDResourceCustomCompareIndex(virPCIVPDResourceCu= stom *a, virPCIVPDResourc * * Returns: true if a value has been updated successfully, false otherwise. */ -bool +void virPCIVPDResourceCustomUpsertValue(GPtrArray *arr, char index, const char = *const value) { g_autoptr(virPCIVPDResourceCustom) custom =3D NULL; @@ -278,9 +278,6 @@ virPCIVPDResourceCustomUpsertValue(GPtrArray *arr, char= index, const char *const guint pos =3D 0; bool found =3D false; - if (arr =3D=3D NULL || value =3D=3D NULL) - return false; - custom =3D g_new0(virPCIVPDResourceCustom, 1); custom->idx =3D index; custom->value =3D g_strdup(value); @@ -294,7 +291,6 @@ virPCIVPDResourceCustomUpsertValue(GPtrArray *arr, char= index, const char *const } else { g_ptr_array_add(arr, g_steal_pointer(&custom)); } - return true; } /** @@ -348,9 +344,7 @@ virPCIVPDResourceUpdateKeyword(virPCIVPDResource *res, = const bool readOnly, res->ro->serial_number =3D g_strdup(value); return true; } else if (virPCIVPDResourceIsVendorKeyword(keyword)) { - if (!virPCIVPDResourceCustomUpsertValue(res->ro->vendor_specif= ic, keyword[1], value)) { - return false; - } + virPCIVPDResourceCustomUpsertValue(res->ro->vendor_specific, k= eyword[1], value); return true; } else if (STREQ("FG", keyword) || STREQ("LC", keyword) || STREQ("= PG", keyword)) { /* Legacy PICMIG keywords are skipped on purpose. */ @@ -371,14 +365,10 @@ virPCIVPDResourceUpdateKeyword(virPCIVPDResource *res= , const bool readOnly, res->rw->asset_tag =3D g_strdup(value); return true; } else if (virPCIVPDResourceIsVendorKeyword(keyword)) { - if (!virPCIVPDResourceCustomUpsertValue(res->rw->vendor_specif= ic, keyword[1], value)) { - return false; - } + virPCIVPDResourceCustomUpsertValue(res->rw->vendor_specific, k= eyword[1], value); return true; } else if (virPCIVPDResourceIsSystemKeyword(keyword)) { - if (!virPCIVPDResourceCustomUpsertValue(res->rw->system_specif= ic, keyword[1], value)) { - return false; - } + virPCIVPDResourceCustomUpsertValue(res->rw->system_specific, k= eyword[1], value); return true; } } diff --git a/src/util/virpcivpdpriv.h b/src/util/virpcivpdpriv.h index 617991930b..f26b64139d 100644 --- a/src/util/virpcivpdpriv.h +++ b/src/util/virpcivpdpriv.h @@ -66,5 +66,5 @@ bool virPCIVPDResourceIsValidTextValue(const char *value); gboolean virPCIVPDResourceCustomCompareIndex(virPCIVPDResourceCustom *a, virPCIVPDR= esourceCustom *b); -bool +void virPCIVPDResourceCustomUpsertValue(GPtrArray *arr, char index, const char = *const value); diff --git a/tests/virpcivpdtest.c b/tests/virpcivpdtest.c index fddb42f52c..8a2f337e85 100644 --- a/tests/virpcivpdtest.c +++ b/tests/virpcivpdtest.c @@ -244,8 +244,7 @@ testPCIVPDResourceCustomUpsertValue(const void *data G_= GNUC_UNUSED) { g_autoptr(GPtrArray) arr =3D g_ptr_array_new_full(0, (GDestroyNotify)v= irPCIVPDResourceCustomFree); virPCIVPDResourceCustom *custom =3D NULL; - if (!virPCIVPDResourceCustomUpsertValue(arr, 'A', "testval")) - return -1; + virPCIVPDResourceCustomUpsertValue(arr, 'A', "testval"); if (arr->len !=3D 1) return -1; @@ -255,8 +254,7 @@ testPCIVPDResourceCustomUpsertValue(const void *data G_= GNUC_UNUSED) return -1; /* Idempotency */ - if (!virPCIVPDResourceCustomUpsertValue(arr, 'A', "testval")) - return -1; + virPCIVPDResourceCustomUpsertValue(arr, 'A', "testval"); if (arr->len !=3D 1) return -1; @@ -266,8 +264,7 @@ testPCIVPDResourceCustomUpsertValue(const void *data G_= GNUC_UNUSED) return -1; /* Existing value updates. */ - if (!virPCIVPDResourceCustomUpsertValue(arr, 'A', "testvalnew")) - return -1; + virPCIVPDResourceCustomUpsertValue(arr, 'A', "testvalnew"); if (arr->len !=3D 1) return -1; @@ -277,8 +274,7 @@ testPCIVPDResourceCustomUpsertValue(const void *data G_= GNUC_UNUSED) return -1; /* Inserting multiple values */ - if (!virPCIVPDResourceCustomUpsertValue(arr, '1', "42")) - return -1; + virPCIVPDResourceCustomUpsertValue(arr, '1', "42"); if (arr->len !=3D 2) return -1; --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org