From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C644EC07E96 for ; Thu, 8 Jul 2021 14:38:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4981360241 for ; Thu, 8 Jul 2021 14:38:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4981360241 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1VB3-0001iL-GD for qemu-devel@archiver.kernel.org; Thu, 08 Jul 2021 10:38:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1V9n-0007mc-1i for qemu-devel@nongnu.org; Thu, 08 Jul 2021 10:37:39 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:40816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1V9l-0002k3-7t for qemu-devel@nongnu.org; Thu, 08 Jul 2021 10:37:38 -0400 Received: by mail-ej1-x632.google.com with SMTP id o5so10045393ejy.7 for ; Thu, 08 Jul 2021 07:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gbxGBSpsRbT/5XHbY3hvQZXNJx9i+gbuEcoJ0VQd7pc=; b=kb5IRWKMGuev7eAO4n6aE24QwVkG0FkNOu9iB368ovRSsxrEuzATZIb+q2kIi5V1XS 2jw/1RdBo/Y/9RUaERy5SuUAf6USFXmKWEy0mag5dlcr8biqGIEu7pJUb38B4jC51Tp0 l9wPMnUlrKkDZrjY6GPr+44kcyJzLGYeGDdNXFB6hm/bKdPmBS0OwMVrZ2GpaUDOaz1L r+2YorPxFVylOtScp/FU4d04+4Hhs+skKLBdjGRGjPhY/u7/R6lWT/yNstdVCiadaQE3 jmkbYqoFRQHhomBkQxUTQFQZueZicpGIAbJTYIu7Ps+yzHrogbuFtt/Q3rbi1aCquyOP Ib9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gbxGBSpsRbT/5XHbY3hvQZXNJx9i+gbuEcoJ0VQd7pc=; b=CZRuIAT9NuuqrsZHc4Utrdn2VFbxBd4Ui4ikHI3/QwE33vZb0cnn5IatA2HqWZu7b0 0Qfy5a4g5Nr2fGkhp5sZhW6yKCsQ8tJYQlyUajPYkh62CkOiN9f+lnygwU5rGrpcoRSS S6i4EOafWWzuw3j2I5m4UBk6RhhpC9ka+ikaxj2+I+yFaNnAGCndpQc5n8iCoPRyiHVK 0jBp7Q8mgV5Ljow67N/GxA5OJu4yLIztLlM/Ac92s9psqo2SiTmv66LuX6f4UQvZ8Yg2 6+bOf0u+jAG5leLhx6s/wv2vOyq/8hjT+rb5VtljLQahV921ATExKKUaagHGxBi1nuqA IwiA== X-Gm-Message-State: AOAM531KgRXrKThPYjbzEtCsQUstOrpYEDeIyg7R4cssPdaSeNbP2Mi/ 3+VU8RCnrWRtH+9K/q4lsiyH9/p6DC/IKSjyah4= X-Google-Smtp-Source: ABdhPJzsVXxeTHTknuY2S8u1itLsJS/tYqEZHwq+DlK7jVHeJAIl9Ee7tSozUzzrmw8iCuYlNLDbfIw2lqET49D6114= X-Received: by 2002:a17:906:dc91:: with SMTP id cs17mr31387058ejc.389.1625755055390; Thu, 08 Jul 2021 07:37:35 -0700 (PDT) MIME-Version: 1.0 References: <1625678434-240960-1-git-send-email-steven.sistare@oracle.com> <1625678434-240960-10-git-send-email-steven.sistare@oracle.com> In-Reply-To: <1625678434-240960-10-git-send-email-steven.sistare@oracle.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Thu, 8 Jul 2021 18:37:23 +0400 Message-ID: Subject: Re: [PATCH V5 09/25] string to strList To: Steve Sistare Content-Type: multipart/alternative; boundary="00000000000091882405c69d986d" Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=marcandre.lureau@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Zeng , Juan Quintela , Eric Blake , "Michael S. Tsirkin" , QEMU , "Dr. David Alan Gilbert" , Alex Williamson , Stefan Hajnoczi , Paolo Bonzini , "Daniel P. Berrange" , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , =?UTF-8?B?QWxleCBCZW5uw6ll?= , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --00000000000091882405c69d986d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jul 7, 2021 at 9:36 PM Steve Sistare wrote: > Generalize strList_from_comma_list to take any delimiter character. > No functional change. > > Signed-off-by: Steve Sistare > Reviewed-by: Marc-Andr=C3=A9 Lureau --- > monitor/hmp-cmds.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index 8e80581..a56f83c 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -71,21 +71,21 @@ void hmp_handle_error(Monitor *mon, Error *err) > } > > /* > - * Produce a strList from a comma separated list. > - * A NULL or empty input string return NULL. > + * Produce a strList from a character delimited string. > + * A NULL or empty input string returns NULL. > */ > -static strList *strList_from_comma_list(const char *in) > +static strList *strList_from_string(const char *in, char delim) > { > strList *res =3D NULL; > strList **tail =3D &res; > > while (in && in[0]) { > - char *comma =3D strchr(in, ','); > + char *next =3D strchr(in, delim); > char *value; > > - if (comma) { > - value =3D g_strndup(in, comma - in); > - in =3D comma + 1; /* skip the , */ > + if (next) { > + value =3D g_strndup(in, next - in); > + in =3D next + 1; /* skip the delim */ > } else { > value =3D g_strdup(in); > in =3D NULL; > @@ -1170,7 +1170,7 @@ void hmp_announce_self(Monitor *mon, const QDict > *qdict) > migrate_announce_params()); > > qapi_free_strList(params->interfaces); > - params->interfaces =3D strList_from_comma_list(interfaces_str); > + params->interfaces =3D strList_from_string(interfaces_str, ','); > params->has_interfaces =3D params->interfaces !=3D NULL; > params->id =3D g_strdup(id); > params->has_id =3D !!params->id; > -- > 1.8.3.1 > > > --=20 Marc-Andr=C3=A9 Lureau --00000000000091882405c69d986d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Jul 7, 2021 at 9:36 PM Steve = Sistare <steven.sistare@ora= cle.com> wrote:
Generalize strList_from_comma_list to take any delimiter character.<= br> No functional change.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>

Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
=
---
=C2=A0monitor/hmp-cmds.c | 16 ++++++++--------
=C2=A01 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 8e80581..a56f83c 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -71,21 +71,21 @@ void hmp_handle_error(Monitor *mon, Error *err)
=C2=A0}

=C2=A0/*
- * Produce a strList from a comma separated list.
- * A NULL or empty input string return NULL.
+ * Produce a strList from a character delimited string.
+ * A NULL or empty input string returns NULL.
=C2=A0 */
-static strList *strList_from_comma_list(const char *in)
+static strList *strList_from_string(const char *in, char delim)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0strList *res =3D NULL;
=C2=A0 =C2=A0 =C2=A0strList **tail =3D &res;

=C2=A0 =C2=A0 =C2=A0while (in && in[0]) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 char *comma =3D strchr(in, ',');
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 char *next =3D strchr(in, delim);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0char *value;

-=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (comma) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 value =3D g_strndup(in, comma - = in);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 in =3D comma + 1; /* skip the , = */
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (next) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 value =3D g_strndup(in, next - i= n);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 in =3D next + 1; /* skip the del= im */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0value =3D g_strdup(in);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0in =3D NULL;
@@ -1170,7 +1170,7 @@ void hmp_announce_self(Monitor *mon, const QDict *qdi= ct)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0migrate_announce_params());

=C2=A0 =C2=A0 =C2=A0qapi_free_strList(params->interfaces);
-=C2=A0 =C2=A0 params->interfaces =3D strList_from_comma_list(interfaces= _str);
+=C2=A0 =C2=A0 params->interfaces =3D strList_from_string(interfaces_str= , ',');
=C2=A0 =C2=A0 =C2=A0params->has_interfaces =3D params->interfaces != =3D NULL;
=C2=A0 =C2=A0 =C2=A0params->id =3D g_strdup(id);
=C2=A0 =C2=A0 =C2=A0params->has_id =3D !!params->id;
--
1.8.3.1




--
Marc-Andr=C3=A9 Lureau
--00000000000091882405c69d986d--