From nobody Mon Feb 9 16:35:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617285300; cv=none; d=zohomail.com; s=zohoarc; b=Wp1o0ad0drCZv641X8Y9eSU0hqiyQ92P4k0k2zAjADpO2MWVRT1ZPFM9/6oUVoA3GtbkD7eeIm+tGYVXqSutcBRbbn35MIJPHKaHVUqZEYdmP/KlMVpwYq9Nw4secrq/nWh/TvMuSgMVfu1oZc6dyZZk/twW/7EfpA7bbHlb/s8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285300; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nmk73VYiiGMWhbkpZZUsYYfQoqjQFy3jEFExa9IeJbY=; b=ZeuBXuUObChbZt5vBBm3UKf9oXOjFgHmJHX3b/2zlEVly8NsC2DigcyrZ8F12xtHbtzl+ua50/TUAXqL9uXMsbc2qFWHsKmp7Ypzn+UlV54I9w1walXyY6Io1QAVhAFyL9L4lyH5L7KoItbSXzUuWXa055a6X7jgRyLcbAUwPJM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1617285300035549.7531405162732; Thu, 1 Apr 2021 06:55:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-498-ghjdBHrlNzG4wULo2OYjzA-1; Thu, 01 Apr 2021 09:54:56 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DD93E19251C1; Thu, 1 Apr 2021 13:54:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B66FA424D; Thu, 1 Apr 2021 13:54:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7818B4A700; Thu, 1 Apr 2021 13:54:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 131Ds1N2023299 for ; Thu, 1 Apr 2021 09:54:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 616107945F; Thu, 1 Apr 2021 13:54:00 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2529795B4 for ; Thu, 1 Apr 2021 13:53:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285299; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nmk73VYiiGMWhbkpZZUsYYfQoqjQFy3jEFExa9IeJbY=; b=OR0+Xvx9t4ZWdE0PiyqGZYkGRruYc9+7ARZVCIel3sf7EZQwL7HD+yURP1+oaBI5uq4s3Z v3nhoTtCYdtwLPEKgwWWCXnBj8hkIVyEcxMKVMQmIsVw6YXLGVFya2DmaLVWGVScO51hSk fuUQ8Vxe9qGpXBvHgJ4mRWG5DgXDki8= X-MC-Unique: ghjdBHrlNzG4wULo2OYjzA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/39] virshParseEventStr: Use g_strsplit and automatic memory freeing Date: Thu, 1 Apr 2021 15:52:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tools/virsh-domain.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a778421b66..86de4255fa 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9342,24 +9342,21 @@ virshParseEventStr(const char *event, int *nparams, int *maxparams) { - char **tok =3D NULL; - size_t i, ntok; - int ret =3D -1; + g_auto(GStrv) tok =3D NULL; + GStrv next; - if (!(tok =3D virStringSplitCount(event, ",", 0, &ntok))) + if (!(tok =3D g_strsplit(event, ",", 0))) return -1; - for (i =3D 0; i < ntok; i++) { - if ((*tok[i] !=3D '\0') && - virTypedParamsAddBoolean(params, nparams, - maxparams, tok[i], state) < 0) - goto cleanup; + for (next =3D tok; *next; next++) { + if (*next[0] =3D=3D '\0') + continue; + + if (virTypedParamsAddBoolean(params, nparams, maxparams, *next, st= ate) < 0) + return -1; } - ret =3D 0; - cleanup: - g_strfreev(tok); - return ret; + return 0; } static void --=20 2.29.2