From nobody Mon Feb 9 15:10:53 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=1617285242; cv=none; d=zohomail.com; s=zohoarc; b=kqQAOwRiOACFJAeyFMvPcwADsP0t7uQUy+u5kwGFo+CPX2OTzpt5ohnilgKaGqTuH6U5Ajdh5mmmkMGDhdvxhmDWeAL4skWEgw0XExEj9JEiInYMJDXw/Ibrr1Rr6RLLOquZ8htts/et5ntbeXtJQuqaqAZt14CDFOehz+9d660= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285242; 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=FSnOd5hWNaFv8DpdpGpBt5GjDI0r0sFrYEiOp6r0oOU=; b=iQfiwtXJbC+kqwCStPNEky8+yFUjknixXfklOi9bJseWrL5S5jFFeQXC2fXm5rV6g49nXYoqgiAVRrcKHmwVViO1hjBViyHtvgoXEXqy2ru7aC3TZi8lSyZp3hVA2ooG79G1zUZXErTD462WUVPD+MBHrm+/fWfbZP3ablfN2yk= 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 1617285242746453.81872554322877; Thu, 1 Apr 2021 06:54:02 -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-369-GFn3VUYBPcCDB6fW_5mMtw-1; Thu, 01 Apr 2021 09:53:59 -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 B567F106BB30; Thu, 1 Apr 2021 13:53:52 +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 8D47351C5C; Thu, 1 Apr 2021 13:53:52 +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 46385180B450; Thu, 1 Apr 2021 13:53:52 +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 131Dr3oF023098 for ; Thu, 1 Apr 2021 09:53:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 606C05C238; Thu, 1 Apr 2021 13:53:03 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1F0C5C1A1 for ; Thu, 1 Apr 2021 13:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285241; 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=FSnOd5hWNaFv8DpdpGpBt5GjDI0r0sFrYEiOp6r0oOU=; b=fEOE/ZjZQOttNO7NrTeULq42e2js3XdJaYBKU13eUytspKzPvT6B5JosMeNL9EukGMMX2Y H9jJkyWCclwLK7QeSV+TmnPcdetqCHnK5s4lbRgF9qHpbmO6aun/MvApaE2pvR3MOFC37n 6MXbXH1/AW1DZEJr8HFO9aBCBUfKQk0= X-MC-Unique: GFn3VUYBPcCDB6fW_5mMtw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/39] virDomainDiskAddISCSIPoolSourceHost: use g_strsplit instead of virStringSplitCount Date: Thu, 1 Apr 2021 15:52:07 +0200 Message-Id: <90065cf85e2dc21d238bb3134dff85f35abeea42.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.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" Count the elements directly using g_strv_length. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d050a519c6..2ab476dfdb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -32080,7 +32080,6 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSourc= ePtr src, virStoragePoolDefPtr pooldef) { g_auto(GStrv) tokens =3D NULL; - size_t ntokens; /* Only support one host */ if (pooldef->source.nhost !=3D 1) { @@ -32101,10 +32100,10 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSou= rcePtr src, src->hosts[0].port =3D 3260; /* iscsi volume has name like "unit:0:0:1" */ - if (!(tokens =3D virStringSplitCount(src->srcpool->volume, ":", 0, &nt= okens))) + if (!(tokens =3D g_strsplit(src->srcpool->volume, ":", 0))) return -1; - if (ntokens !=3D 4) { + if (g_strv_length(tokens) !=3D 4) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected iscsi volume name '%s'"), src->srcpool->volume); --=20 2.29.2