From nobody Mon Feb 9 09:01:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1617285308; cv=none; d=zohomail.com; s=zohoarc; b=CVbGokPlMjufNGW2oSSkpz+wKfxYqqSje7FTUwyDnhatz1fhoWrvcVBgIWZCNUoz5HOn0skJbNztViFbHcoR7FIcZ74FZOYxWAqQ0LCzZC9kP030LxvFi85HkO0rBQYrUFKnEYctoAhWsK8BcrOxOjQ9szqGyxgaCgTdgvvGzAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285308; 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=Y1DBrOgOn11Lkn6d58B4M+5EapuqaCYxrTSMf/+Rm68=; b=fcGzXTYDAaeeBPxYFZASLjpm+a+6CjQabctsg1e2LLFuKtJXtcK4OL/iF7ntZEOfImPFHCuCW66HU1jkz8nEeMyiC9Twu2HATxckULIUna/ei2JLMh5mSX8ufkm6lGgQUzs+6bcWXMc2lFmqIMREKf/SK3twByp8dJAvqvnnEvw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1617285308621136.7983534583309; Thu, 1 Apr 2021 06:55:08 -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-342-WTsodEDTN-6Bzn7_5chpww-1; Thu, 01 Apr 2021 09:54:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C83319251A8; Thu, 1 Apr 2021 13:54:48 +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 585425D6B1; Thu, 1 Apr 2021 13:54:48 +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 112C44A701; Thu, 1 Apr 2021 13:54:48 +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 131DruRf023251 for ; Thu, 1 Apr 2021 09:53:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 719EC79583; Thu, 1 Apr 2021 13:53:55 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B77879824 for ; Thu, 1 Apr 2021 13:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285307; 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=Y1DBrOgOn11Lkn6d58B4M+5EapuqaCYxrTSMf/+Rm68=; b=UoJTrilZ2zMLdIWKxdbt/p3RCnoyBON1b/rpzG9x+xi3lffnrgdEACJWdi2oplXcqvxzIy vpxCl8hXC4yQ5Y+HvU/fGPqza74iabsAC/reOy75V0tzAe+G6K5d0z7tQ2P/+ndV3VJyXw FJByfDmyK6iPUitoaSwOzE7phw0G91E= X-MC-Unique: WTsodEDTN-6Bzn7_5chpww-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/39] virLogParseFilters: Refactor string list handling Date: Thu, 1 Apr 2021 15:52:13 +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.15 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" Rewrite the code to remove the need to calculate the string list count. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virlog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 56059f62f1..57eb0de538 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1668,22 +1668,22 @@ int virLogParseFilters(const char *src, virLogFilterPtr **filters) { size_t nfilters =3D 0; - size_t i, count; g_auto(GStrv) strings =3D NULL; + GStrv next; virLogFilterPtr filter =3D NULL; virLogFilterPtr *list =3D NULL; VIR_DEBUG("filters=3D%s", src); - if (!(strings =3D virStringSplitCount(src, " ", 0, &count))) + if (!(strings =3D g_strsplit(src, " ", 0))) return -1; - for (i =3D 0; i < count; i++) { + for (next =3D strings; *next; next++) { /* virStringSplit may return empty strings */ - if (STREQ(strings[i], "")) + if (STREQ(*next, "")) continue; - if (!(filter =3D virLogParseFilter(strings[i]))) + if (!(filter =3D virLogParseFilter(*next))) return -1; if (VIR_APPEND_ELEMENT(list, nfilters, filter)) { --=20 2.29.2