From nobody Mon Feb 9 07:44:37 2026 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 1727703102027676.2740982865928; Mon, 30 Sep 2024 06:31:42 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 02AD2123C; Mon, 30 Sep 2024 09:31:41 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DF07E1453; Mon, 30 Sep 2024 09:29:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2CE3B13DA; Mon, 30 Sep 2024 09:29:53 -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 5EE3A1417 for ; Mon, 30 Sep 2024 09:29:45 -0400 (EDT) Received: from mx-prod-mc-02.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-547-TUchAvG6Mge9Q7NEjCOT5Q-1; Mon, 30 Sep 2024 09:29:42 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 509FA1903361 for ; Mon, 30 Sep 2024 13:29:41 +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 896F019541A0 for ; Mon, 30 Sep 2024 13:29:40 +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=1727702985; 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=NVADxGRbZ9CPhsweuaxBqbxRKOiHAdoVGufwHQE1Hno=; b=Op+jci53/qeLbQnxNhIuuBffE9nvFZg4dVSICyXjUC1YjxBUo4cPj0vLDAxDXxhc0bq/fo xyv6FSXrm4/y60s4WYMCQ7HCwY22CITE7QGqnewQ1SAq/i8AoMSXI5q/GlAPo12iGuize6 jQ+d5p7liB3JV/K+oaD2E33gAdFqcoc= X-MC-Unique: TUchAvG6Mge9Q7NEjCOT5Q-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 03/13] virTypedParamsGetStringList: Refactor and adjust docs Date: Mon, 30 Sep 2024 15:29:25 +0200 Message-ID: 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: FN3XAWHU2BS6FWJDSYGXEWBJMGQFSNSI X-Message-ID-Hash: FN3XAWHU2BS6FWJDSYGXEWBJMGQFSNSI 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: 1727703102842116600 Content-Type: text/plain; charset="utf-8" Use automatic freeing, declare one variable per line and return early when possible. As this is an internal helper there's no need to check that the caller passed non-NULL @values. Modify the documentation to be accurate and warn callers to not free the strings just the array. Signed-off-by: Peter Krempa --- src/util/virtypedparam.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index 634385aa97..86fbaf5e9d 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -432,13 +432,13 @@ virTypedParamsFilter(virTypedParameterPtr params, * @values: array of returned values * * Finds all parameters with desired @name within @params and - * store their values into @values. The @values array is self - * allocated and its length is stored into @picked. When no - * longer needed, caller should free the returned array, but not - * the items since they are taken from @params array. + * store their values into @values. * - * Returns amount of strings in @values array on success, - * -1 otherwise. + * Important: The strings in the returned string list @values are borrowed= from + * @params and thus caller must free only the pointer returned as @values,= but + * not the contents. + * + * Returns amount of strings in @values array on success. */ int virTypedParamsGetStringList(virTypedParameterPtr params, @@ -446,31 +446,26 @@ virTypedParamsGetStringList(virTypedParameterPtr para= ms, const char *name, const char ***values) { - size_t i, n; + size_t i; + size_t n =3D 0; size_t nfiltered; - virTypedParameterPtr *filtered =3D NULL; + g_autofree virTypedParameterPtr *filtered =3D NULL; - virCheckNonNullArgGoto(values, error); *values =3D NULL; nfiltered =3D virTypedParamsFilter(params, nparams, name, &filtered); - if (nfiltered) - *values =3D g_new0(const char *, nfiltered); + if (nfiltered =3D=3D 0) + return 0; + + *values =3D g_new0(const char *, nfiltered); - for (n =3D 0, i =3D 0; i < nfiltered; i++) { + for (i =3D 0; i < nfiltered; i++) { if (filtered[i]->type =3D=3D VIR_TYPED_PARAM_STRING) (*values)[n++] =3D filtered[i]->value.s; } - VIR_FREE(filtered); return n; - - error: - if (values) - VIR_FREE(*values); - VIR_FREE(filtered); - return -1; } --=20 2.46.0