From nobody Mon Feb 9 10:34:35 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=1617285264; cv=none; d=zohomail.com; s=zohoarc; b=butoLFEpH0VZH3WRNw4E746JUQLrI1oUPGNUJr6PwMcP8Xr2jAZQQvq14R2VlN9rXnsamXuJXGNKnULATPJmK5BrFKz/n6TrHEzHlZKvmJ3/dk90vCuGWqrIhES3fU+8mQ/RXxyuJeUoWJ3er3mwyxhQqQy+B5Z53p4pfIGbgJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285264; 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=cf3XGOOjQTLb2J9htFw1hKhub6/o7igYwS594ill2D4=; b=nDxyBnuaq5hNJQCirrXZscrezMVLN74GOkp8Sb0actolgTIY+WyGizK5fOtkhXyGNyA9SIPDfWAB9k92emDS2PNEQg2C12yRLQnNKEtHVnlkH0CwLHuyRJ1WnEIvH4IcUTRcS5hTo9OEx3JDSoAfE6+2XjlZBHkjgn+9qha+Nzk= 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 1617285264600293.714451666316; Thu, 1 Apr 2021 06:54:24 -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-515-G4U40WIbMvOaUrEYfXu9cw-1; Thu, 01 Apr 2021 09:54:21 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E38951005D69; Thu, 1 Apr 2021 13:54:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF8875C1A1; Thu, 1 Apr 2021 13:54:05 +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 4E9491802138; Thu, 1 Apr 2021 13:54:05 +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 131DrxrC023284 for ; Thu, 1 Apr 2021 09:53:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5FDC3795BB; Thu, 1 Apr 2021 13:53:58 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D237179800 for ; Thu, 1 Apr 2021 13:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285263; 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=cf3XGOOjQTLb2J9htFw1hKhub6/o7igYwS594ill2D4=; b=VO/bViNqBC98NnjWz4lDtTeEcM2CRX5x1qzqz2kEIpQSh6opjFet3RoELX+GA1eLLP/ifY ibxdp2FwTgmJaX9t9ysxnzhfsrRd2LJmHCmwM+Q6wCo5pBCO3qLE17aQwD4nz0sr4QYJdG lWMfaHlcjhzvP9DQWZdmtRNNew0tE18= X-MC-Unique: G4U40WIbMvOaUrEYfXu9cw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/39] virLogParseOutput: Replace virStringSplitCount by g_strsplit Date: Thu, 1 Apr 2021 15:52:15 +0200 Message-Id: <9b0bd577bd98bc54f15268387562aa693b153c34.1617285119.git.pkrempa@redhat.com> 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.16 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" Unfortunately here we do need the count of elements. Use g_strv_length to calculate it so that virStringSplitCount can be removed later. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virlog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 8a4cfbfdc2..3fb27fcb25 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1470,7 +1470,8 @@ virLogParseOutput(const char *src) /* split our format prio:destination:additional_data to tokens and par= se * them individually */ - if (!(tokens =3D virStringSplitCount(src, ":", 0, &count)) || count < = 2) { + if (!(tokens =3D g_strsplit(src, ":", 0)) || + (count =3D g_strv_length(tokens))< 2) { virReportError(VIR_ERR_INVALID_ARG, _("Malformed format for output '%s'"), src); return NULL; --=20 2.29.2