From nobody Mon Feb 9 19:25:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1617285377; cv=none; d=zohomail.com; s=zohoarc; b=Y0WdrjvngZ7KUAhqMngzknteATjinYhC5VBBtGYM4UophX58HUxz4LTYDUFgM4NlCxcLodZarXVqxwTGKB13r/cKb73kiWVNS6BXy4ytMx9QByTEL42LMX/jy1bf27Z5G64+9UH1ryAx96ExinI8+R3VOr6QAIzOzK+3qwljREo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285377; 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=giu1SB2NrUgXXC/HDTvXyc7LkZasQSt9TcMSDRZ01zA=; b=Qou1cfWQNMPg05noiNQnVXgVmjhUG58egPFkM0+t6BdRsuTI4OKPo1lFCaTp0odqvknC4GVHWq8XLXloePwn0xghPcdE7McOmVyL33StfK11pYESilu4bSbv/v/QY67BA+RfA6efoJ06UGZJQnvBDcQ4qDVzJVqiVwr8D2g1jmg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1617285377682301.8046358362619; Thu, 1 Apr 2021 06:56:17 -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-31-7QHq09aAO1GFwobBBAowAg-1; Thu, 01 Apr 2021 09:55:25 -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 AA0348B99E5; Thu, 1 Apr 2021 13:55:07 +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 6DFCA51C4E; Thu, 1 Apr 2021 13:55:07 +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 231A24A700; Thu, 1 Apr 2021 13:55:07 +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 131DsACw023502 for ; Thu, 1 Apr 2021 09:54:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4B73C5C5FC; Thu, 1 Apr 2021 13:54:10 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CB615C237 for ; Thu, 1 Apr 2021 13:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285376; 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=giu1SB2NrUgXXC/HDTvXyc7LkZasQSt9TcMSDRZ01zA=; b=dBGr1Gf5H43W79WaotgiS5uNfZgcuPd2rub5x+5ORAS3D49Y11MRGyDHH3wxXT6fFyNotI gpjVkogR1eJ6XidnjuTngP8/z40cqJZhlF6cmUPjUzSUwWqTzwBpKLd+kNrISTUlkFfqP8 /ItEMHwG5HlwukF71lweXob5Di3Kqas= X-MC-Unique: 7QHq09aAO1GFwobBBAowAg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 25/39] storage: zfs: Use g_strsplit instead of virStringSplitCount Date: Thu, 1 Apr 2021 15:52:24 +0200 Message-Id: <0244b07b868f68b2ffa2ec7771a01792cffeef07.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" Both instances just check the length once. Replicate that faithfully. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/storage/storage_backend_zfs.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backen= d_zfs.c index 6fed25cf4d..c36deb9dac 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -96,7 +96,6 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, const char *volume_string) { int ret =3D -1; - size_t count; char *vol_name; bool is_new_vol =3D false; virStorageVolDefPtr volume =3D NULL; @@ -104,10 +103,10 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr poo= l, g_auto(GStrv) tokens =3D NULL; char *tmp; - if (!(tokens =3D virStringSplitCount(volume_string, "\t", 0, &count))) + if (!(tokens =3D g_strsplit(volume_string, "\t", 0))) return -1; - if (count !=3D 3) + if (g_strv_length(tokens) !=3D 3) goto cleanup; vol_name =3D tokens[0]; @@ -246,16 +245,15 @@ virStorageBackendZFSRefreshPool(virStoragePoolObjPtr = pool G_GNUC_UNUSED) for (i =3D 0; lines[i]; i++) { g_auto(GStrv) tokens =3D NULL; - size_t count; char *prop_name; if (STREQ(lines[i], "")) continue; - if (!(tokens =3D virStringSplitCount(lines[i], "\t", 0, &count))) + if (!(tokens =3D g_strsplit(lines[i], "\t", 0))) goto cleanup; - if (count !=3D 4) + if (g_strv_length(tokens) !=3D 4) continue; prop_name =3D tokens[1]; --=20 2.29.2