From nobody Wed Feb 5 08:54:52 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 1729695328050463.9852693955221; Wed, 23 Oct 2024 07:55:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D515F1B98; Wed, 23 Oct 2024 10:55:26 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E47BB1B0F; Wed, 23 Oct 2024 10:55:06 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1C87B1AF9; Wed, 23 Oct 2024 10:55:04 -0400 (EDT) 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 2A2221AF6 for ; Wed, 23 Oct 2024 10:55:03 -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-114-H3WGqjBWMqSDpBaNfTcIgQ-1; Wed, 23 Oct 2024 10:55:01 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [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 C7B0F1955D65 for ; Wed, 23 Oct 2024 14:55:00 +0000 (UTC) Received: from orkuz (unknown [10.43.3.115]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 58C2A19560A2 for ; Wed, 23 Oct 2024 14:55:00 +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.6 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=1729695302; 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=o3yvh6xTa7L7ChGrBkXTacPSSmRFGE4pKnIUhLHHY84=; b=cSENz9q/9lrj9cghjGwPsPcWZMq6w1/Lr0cUs4eXmFhb7a2GzBv+uv37DIu0JSCMpMmRpo DAxbFtBfLgfyFoNDEdIdfk/atfMFUd0GKth9WhdQNiVVPmka6er48DGLeV1TgZqL6aSIEv hyDDBRzr8zEmoIgEUBx4gNO711swENs= X-MC-Unique: H3WGqjBWMqSDpBaNfTcIgQ-1 From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH v2 1/4] util: Introduce virStringListRemoveDuplicates Date: Wed, 23 Oct 2024 16:54:50 +0200 Message-ID: <4058a4005f1c5ff28aea1d64f722f1bfc8c8961b.1729695115.git.jdenemar@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: MVP3FYWUHHAWFHSLKB722IFGJRY6UZAV X-Message-ID-Hash: MVP3FYWUHHAWFHSLKB722IFGJRY6UZAV X-MailFrom: jdenemar@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: 1729695329968116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 2: - new patch src/libvirt_private.syms | 1 + src/util/virstring.c | 29 +++++++++++++++++++++++++++++ src/util/virstring.h | 2 ++ 3 files changed, 32 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c1542847f4..89cd20eece 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3438,6 +3438,7 @@ virStringHasControlChars; virStringHasSuffix; virStringIsEmpty; virStringIsPrintable; +virStringListRemoveDuplicates; virStringMatch; virStringMatchesNameSuffix; virStringParsePort; diff --git a/src/util/virstring.c b/src/util/virstring.c index 81c9aff304..bc9b6cd40e 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1065,3 +1065,32 @@ virStringParseVersion(unsigned long long *version, =20 return 0; } + + +/** + * virStringListRemoveDuplicates: + * @list: pointer to a sorted NULL-terminated string list + * + * Replace the list pointed to by @list with a new list without duplicate + * strings. The original list has to be sorted. + */ +void +virStringListRemoveDuplicates(char ***list) +{ + size_t len =3D g_strv_length(*list); + char **unique; + size_t n =3D 0; + size_t i; + + unique =3D g_malloc0_n(len + 1, sizeof(char *)); + + for (i =3D 0; i < len; i++) { + if (n > 0 && STREQ_NULLABLE(unique[n - 1], (*list)[i])) + g_free((*list)[i]); + else + unique[n++] =3D (*list)[i]; + } + + g_free(*list); + *list =3D g_renew(char *, unique, n + 1); +} diff --git a/src/util/virstring.h b/src/util/virstring.h index 8f9b1edc8f..31a404e106 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -138,3 +138,5 @@ int virStringParseYesNo(const char *str, int virStringParseVersion(unsigned long long *version, const char *str, bool allowMissing); + +void virStringListRemoveDuplicates(char ***list); --=20 2.47.0