From nobody Fri Dec 19 17:06:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) 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 1727703048993140.18007905477452; Mon, 30 Sep 2024 06:30:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E461D1522; Mon, 30 Sep 2024 09:30:47 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 077581452; Mon, 30 Sep 2024 09:29:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3A066124D; Mon, 30 Sep 2024 09:29:43 -0400 (EDT) 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 B784DC61 for ; Mon, 30 Sep 2024 09:29:42 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-489-8LUhJYZ1OuWO0rmeeWevqg-1; Mon, 30 Sep 2024 09:29:40 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.12]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0F5E619772F6 for ; Mon, 30 Sep 2024 13:29:40 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.12]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5125119541A0 for ; Mon, 30 Sep 2024 13:29:39 +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.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727702982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NjIm7/i3mvEYClBqnOvAf4uQ9Yf4L87GsJLy7e17go4=; b=BxAq6G97inKW+HMtx2hgWAChn6bNdWRy5T3iO2ROrvyV8W54ZcPJdv0OWizPfSQdL24DmY 5op+/bKR+JcL6Ju0UAajUaUdTYO5EGTQ61vrhv/H9W5qNxfjEcFhC+XdZMXPKJMlvJ7bdK xJVO3Rv+0aj/2Z7q868tS0/tklKvQXc= X-MC-Unique: 8LUhJYZ1OuWO0rmeeWevqg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 02/13] virTypedParamsFilter: Adjust return type and docs Date: Mon, 30 Sep 2024 15:29:24 +0200 Message-ID: <9708a9fe5ae4eece26e73f89ce364b5b0cda5fd8.1727702835.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UU4HKSZP2URXBYWQVZGVQ4SDHUVQD7O4 X-Message-ID-Hash: UU4HKSZP2URXBYWQVZGVQ4SDHUVQD7O4 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1727703050566116600 Content-Type: text/plain; charset="utf-8" The 'virTypedParamsFilter' function can't fail and thus it never returns negative values. Change the return type to 'size_t' and adjust callers to not check the return value for being negative. Adjust the docs to hilight this and also the fact that the filtered typed param list returned via @ret is not a deep copy and thus callers must not use the common function to free it. Signed-off-by: Peter Krempa --- src/util/virtypedparam.c | 19 ++++++++++--------- src/util/virtypedparam.h | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index 1be249d855..634385aa97 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -394,18 +394,22 @@ virTypedParamsCopy(virTypedParameterPtr *dst, * @ret: pointer to the returned array * * Filters @params retaining only the parameters named @name in the - * resulting array @ret. Caller should free the @ret array but not - * the items since they are pointing to the @params elements. + * resulting array @ret. * - * Returns amount of elements in @ret on success, -1 on error. + * Important Caller should free the @ret array but not the items since the= y are + * pointing to the @params elements. I.e. callers must not use + * 'virTypedParamsFree' or equivalent on pointer returned via @ret. + * + * Returns amount of elements in @ret. */ -int +size_t virTypedParamsFilter(virTypedParameterPtr params, int nparams, const char *name, virTypedParameterPtr **ret) { - size_t i, n =3D 0; + size_t i; + size_t n =3D 0; *ret =3D g_new0(virTypedParameterPtr, nparams); @@ -443,7 +447,7 @@ virTypedParamsGetStringList(virTypedParameterPtr params, const char ***values) { size_t i, n; - int nfiltered; + size_t nfiltered; virTypedParameterPtr *filtered =3D NULL; virCheckNonNullArgGoto(values, error); @@ -451,9 +455,6 @@ virTypedParamsGetStringList(virTypedParameterPtr params, nfiltered =3D virTypedParamsFilter(params, nparams, name, &filtered); - if (nfiltered < 0) - goto error; - if (nfiltered) *values =3D g_new0(const char *, nfiltered); diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 7454ef3ce0..afd923aacb 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -81,7 +81,7 @@ virTypedParamsGetStringList(virTypedParameterPtr params, int nparams, const char *name, const char ***values); -int +size_t virTypedParamsFilter(virTypedParameterPtr params, int nparams, const char *name, --=20 2.46.0